[CalendarServer-changes] [4332] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 4332
          http://trac.macosforge.org/projects/calendarserver/changeset/4332
Author:   wsanchez at apple.com
Date:     2009-06-05 10:02:36 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
Edit kwargs instead of adding them separately; otherwise you might get conflicts

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/accesslog.py
    CalendarServer/trunk/twistedcaldav/log.py

Modified: CalendarServer/trunk/twistedcaldav/accesslog.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/accesslog.py	2009-06-05 00:12:56 UTC (rev 4331)
+++ CalendarServer/trunk/twistedcaldav/accesslog.py	2009-06-05 17:02:36 UTC (rev 4332)
@@ -175,7 +175,7 @@
 
         self.globalHitHistory.append({'time':int(time.time()), 'hits':self.globalHitCount}) 
         del self.globalHitHistory[0] 
-        log.debug("rotateGlobalHitHistoryStats: %s" % (self.globalHitHistory,), logLevel=logging.DEBUG) 
+        log.debug("rotateGlobalHitHistoryStats: %s" % (self.globalHitHistory,))
         if config.GlobalStatsLoggingFrequency is not 0: 
             self.reactor.callLater(
                 config.GlobalStatsLoggingPeriod * 60 / config.GlobalStatsLoggingFrequency, 

Modified: CalendarServer/trunk/twistedcaldav/log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/log.py	2009-06-05 00:12:56 UTC (rev 4331)
+++ CalendarServer/trunk/twistedcaldav/log.py	2009-06-05 17:02:36 UTC (rev 4332)
@@ -205,16 +205,19 @@
         assert level in logLevels, "Unknown log level: %r" % (level,)
 
         # FIXME: Filtering should be done by the log observer(s)
-        if self.willLogAtLevel(level):
-            log.msg(
-                # FIXME: This formatting should be done by the log observer(s)
-                "[%s#%s] %s" % (self.namespace, level, message),
-                level = level,
-                logLevel = pythonLogLevelForLevel(level),
-                namespace = self.namespace,
-                **kwargs
-            )
+        if not self.willLogAtLevel(level):
+            return
 
+        kwargs["logLevel"] = pythonLogLevelForLevel(level)
+        kwargs["level"] = level
+        kwargs["namespace"] = self.namespace
+
+        log.msg(
+            # FIXME: This formatting should be done by the log observer(s)
+            "[%s#%s] %s" % (self.namespace, level, message),
+            **kwargs
+        )
+
     def level(self):
         """
         @return: the logging level for this logger's namespace.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090605/ef102437/attachment.html>