[CalendarServer-changes] [4186] CalendarServer/branches/release/CalendarServer-2.2-dev
source_changes at macosforge.org
source_changes at macosforge.org
Tue May 5 16:58:01 PDT 2009
Revision: 4186
http://trac.macosforge.org/projects/calendarserver/changeset/4186
Author: wsanchez at apple.com
Date: 2009-05-05 16:58:00 -0700 (Tue, 05 May 2009)
Log Message:
-----------
Pulled up r4166 r4167 from trunk.
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/log.py
CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/test/test_log.py
Property Changed:
----------------
CalendarServer/branches/release/CalendarServer-2.2-dev/
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.txt
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.xml
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.txt
CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.xml
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4165,4174-4176,4178-4179
+ /CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/trunk:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4167,4174-4176,4178-4179
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4165,4174-4176,4178-4179
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4167,4174-4176,4178-4179
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-privatecomments.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4165,4174-4176,4178-4179
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-privatecomments-00.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-privatecomments-00.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-privatecomments.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-privatecomments-00.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-privatecomments.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-privatecomments.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-privatecomments.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-privatecomments.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4167,4174-4176,4178-4179
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.txt
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4165,4174-4176,4178-4179
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.txt:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.txt:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.txt:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.txt:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.txt:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.txt:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.txt:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.txt:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4167,4174-4176,4178-4179
Property changes on: CalendarServer/branches/release/CalendarServer-2.2-dev/doc/Extensions/caldav-schedulingchanges.xml
___________________________________________________________________
Modified: svn:mergeinfo
- /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4165,4174-4176,4178-4179
+ /CalendarServer/branches/users/cdaboo/attendee-comments-2886/doc/Extensions/caldav-schedulingchanges-01.xml:2887-2910
/CalendarServer/branches/users/cdaboo/byebye-serviceslocator-2937/doc/Extensions/caldav-schedulingchanges-01.xml:2938-3097
/CalendarServer/branches/users/cdaboo/implicit-if-match-3306/doc/Extensions/caldav-schedulingchanges.xml:3307-3349
/CalendarServer/branches/users/cdaboo/implicitauto-2947/doc/Extensions/caldav-schedulingchanges-01.xml:2948-2989
/CalendarServer/branches/users/cdaboo/location-partial-accept-3573/doc/Extensions/caldav-schedulingchanges.xml:3574-3581
/CalendarServer/branches/users/sagen/resource-delegates-4038/doc/Extensions/caldav-schedulingchanges.xml:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/doc/Extensions/caldav-schedulingchanges.xml:4068-4075
/CalendarServer/trunk/doc/Extensions/caldav-schedulingchanges.xml:4105-4107,4113-4116,4121-4122,4124,4137-4139,4141-4144,4154-4159,4163-4167,4174-4176,4178-4179
Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/log.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/log.py 2009-05-05 23:56:04 UTC (rev 4185)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/log.py 2009-05-05 23:58:00 UTC (rev 4186)
@@ -133,7 +133,7 @@
Clears all log levels to the default.
"""
logLevelsByNamespace.clear()
- logLevelsByNamespace[None] = "info"
+ logLevelsByNamespace[None] = "info" # Default log level
logLevelsByNamespace = {}
clearLogLevels()
@@ -203,6 +203,7 @@
"""
return cmpLogLevels(self.level(), level) <= 0
+ # FIXME: This doesn't belong here
def logRequest(self, level, message, request, **kwargs):
"""
Log an HTTP request.
@@ -245,6 +246,7 @@
else:
return succeed(None)
+ # FIXME: This doesn't belong here
def logResponse(self, level, message, response, **kwargs):
"""
Log an HTTP request.
@@ -315,11 +317,16 @@
def log_emit(self, message, level=level, **kwargs):
self.emit(level, message, **kwargs)
+ def will_emit(self, level=level):
+ return self.willLogAtLevel(level)
+
log_emit.__doc__ = doc
setattr(Logger, level, log_emit)
+ setattr(Logger, level + "_enabled", property(will_emit))
del log_emit
+ del will_emit
#
# Attach methods to LoggingMixIn
@@ -327,11 +334,17 @@
def log_emit(self, message, level=level, **kwargs):
self.logger.emit(level, message, **kwargs)
+ def will_emit(self=log_emit, level=level):
+ return self.logger.willLogAtLevel(level)
+
log_emit.__doc__ = doc
+ log_emit.enabled = will_emit
- setattr(LoggingMixIn, "log_%s" % (level,), log_emit)
+ setattr(LoggingMixIn, "log_" + level, log_emit)
+ setattr(LoggingMixIn, "log_" + level + "_enabled", property(will_emit))
del log_emit
+ del will_emit
del level
Modified: CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/test/test_log.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/test/test_log.py 2009-05-05 23:56:04 UTC (rev 4185)
+++ CalendarServer/branches/release/CalendarServer-2.2-dev/twistedcaldav/test/test_log.py 2009-05-05 23:58:00 UTC (rev 4186)
@@ -65,27 +65,42 @@
object = LoggingEnabledObject()
self.assertEquals(object.logger.namespace, "twistedcaldav.test.test_log.LoggingEnabledObject")
- def test_basic(self):
+ def test_basic_Logger(self):
"""
- Test that log levels and messages are emitted correctly.
- Tests both Logger and LoggingMixIn.
+ Test that log levels and messages are emitted correctly for
+ Logger.
"""
- object = LoggingEnabledObject()
-
for level in logLevels:
message = "This is a %s message" % (level,)
log = TestLogger()
- object.logger = log
+ method = getattr(log, level)
+ method(message, junk=message)
- for method in (getattr(log, level), getattr(object, "log_" + level)):
- method(message, junk=message)
+ # Ensure that test_emit got called with expected arguments
+ self.assertEquals(log.emitted["level"], level)
+ self.assertEquals(log.emitted["message"], message)
+ self.assertEquals(log.emitted["kwargs"]["junk"], message)
- # Ensure that test_emit got called with expected arguments
- self.assertEquals(log.emitted["level"], level)
- self.assertEquals(log.emitted["message"], message)
- self.assertEquals(log.emitted["kwargs"]["junk"], message)
+ def test_basic_LoggingMixIn(self):
+ """
+ Test that log levels and messages are emitted correctly for
+ LoggingMixIn.
+ """
+ for level in logLevels:
+ message = "This is a %s message" % (level,)
+ object = LoggingEnabledObject()
+ object.logger = TestLogger()
+
+ method = getattr(object, "log_" + level)
+ method(message, junk=message)
+
+ # Ensure that test_emit got called with expected arguments
+ self.assertEquals(object.logger.emitted["level"], level)
+ self.assertEquals(object.logger.emitted["message"], message)
+ self.assertEquals(object.logger.emitted["kwargs"]["junk"], message)
+
def test_defaultLogLevel(self):
"""
Default log level is used.
@@ -122,3 +137,45 @@
self.assertEquals(logLevelForNamespace("twisted.web2.dav" ), defaultLogLevel)
self.assertEquals(logLevelForNamespace("twisted.web2.dav.test" ), defaultLogLevel)
self.assertEquals(logLevelForNamespace("twisted.web2.dav.test1.test2"), defaultLogLevel)
+
+ def test_willLogAtLevel(self):
+ """
+ willLogAtLevel()
+ """
+ clearLogLevels()
+
+ log = Logger()
+
+ for level in logLevels:
+ if cmpLogLevels(level, log.level()) < 0:
+ self.assertFalse(log.willLogAtLevel(level))
+ else:
+ self.assertTrue(log.willLogAtLevel(level))
+
+ def test_logMethodTruthiness_Logger(self):
+ """
+ Logger's log level functions/methods have true/false
+ value based on whether they will log.
+ """
+ log = Logger()
+
+ for level in logLevels:
+ enabled = getattr(log, level + "_enabled")
+ if enabled:
+ self.assertTrue(log.willLogAtLevel(level))
+ else:
+ self.assertFalse(log.willLogAtLevel(level))
+
+ def test_logMethodTruthiness_LoggingMixIn(self):
+ """
+ LoggingMixIn's log level functions/methods have true/false
+ value based on whether they will log.
+ """
+ object = LoggingEnabledObject()
+
+ for level in logLevels:
+ enabled = getattr(object, "log_" + level + "_enabled")
+ if enabled:
+ self.assertTrue(object.logger.willLogAtLevel(level))
+ else:
+ self.assertFalse(object.logger.willLogAtLevel(level))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090505/22d77a93/attachment-0001.html>
More information about the calendarserver-changes
mailing list