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

[source_changes at macosforge.org]

Revision: 4334
          http://trac.macosforge.org/projects/calendarserver/changeset/4334
Author:   wsanchez at apple.com
Date:     2009-06-05 10:59:58 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
Clear log levels at setUp and tearDown

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/log.py
    CalendarServer/trunk/twistedcaldav/test/test_log.py

Modified: CalendarServer/trunk/twistedcaldav/log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/log.py	2009-06-05 17:12:09 UTC (rev 4333)
+++ CalendarServer/trunk/twistedcaldav/log.py	2009-06-05 17:59:58 UTC (rev 4334)
@@ -204,12 +204,14 @@
         """
         assert level in logLevels, "Unknown log level: %r" % (level,)
 
+        logLevel = pythonLogLevelForLevel(level)
+
         # FIXME: Filtering should be done by the log observer(s)
         if not self.willLogAtLevel(level):
             return
 
-        kwargs["logLevel"] = pythonLogLevelForLevel(level)
         kwargs["level"] = level
+        kwargs["logLevel"] = logLevel
         kwargs["namespace"] = self.namespace
 
         log.msg(
@@ -350,11 +352,11 @@
     #
     # Attach methods to Logger
     #
-    def log_emit(self, message, level=level, **kwargs):
-        self.emit(level, message, **kwargs)
+    def log_emit(self, message, __level__=level, **kwargs):
+        self.emit(__level__, message, **kwargs)
 
-    def will_emit(self, level=level):
-        return self.willLogAtLevel(level)
+    def will_emit(self, __level__=level):
+        return self.willLogAtLevel(__level__)
 
     log_emit.__doc__ = doc
 
@@ -367,11 +369,11 @@
     #
     # Attach methods to LoggingMixIn
     #
-    def log_emit(self, message, level=level, **kwargs):
-        self.logger.emit(level, message, **kwargs)
+    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)
+    def will_emit(self=log_emit, __level__=level):
+        return self.logger.willLogAtLevel(__level__)
 
     log_emit.__doc__ = doc
     log_emit.enabled = will_emit

Modified: CalendarServer/trunk/twistedcaldav/test/test_log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_log.py	2009-06-05 17:12:09 UTC (rev 4333)
+++ CalendarServer/trunk/twistedcaldav/test/test_log.py	2009-06-05 17:59:58 UTC (rev 4334)
@@ -47,6 +47,14 @@
     pass
 
 class Logging (TestCase):
+    def setUp(self):
+        super(Logging, self).setUp()
+        clearLogLevels()
+
+    def tearDown(self):
+        super(Logging, self).tearDown()
+        clearLogLevels()
+
     def test_cmpLogLevels(self):
         self.assertEquals(cmpLogLevels("info" , "error"), -1)
         self.assertEquals(cmpLogLevels("debug", "debug"),  0)
@@ -132,15 +140,12 @@
         """
         Default log level is used.
         """
-        clearLogLevels()
         self.failUnless(logLevelForNamespace("rocker.cool.namespace"), defaultLogLevel)
 
     def test_logLevel(self):
         """
         Setting and retrieving log levels.
         """
-        clearLogLevels()
-
         setLogLevelForNamespace("twisted.web2", "debug")
         setLogLevelForNamespace("twisted.web2.dav", "error")
 
@@ -169,8 +174,6 @@
         """
         willLogAtLevel()
         """
-        clearLogLevels()
-
         log = Logger()
 
         for level in logLevels:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090605/21ef4605/attachment-0001.html>