[CalendarServer-changes] [11264] CalendarServer/trunk/twext/python/log.py

[source_changes at macosforge.org]

Revision: 11264
          http://trac.calendarserver.org//changeset/11264
Author:   wsanchez at apple.com
Date:     2013-05-30 11:43:41 -0700 (Thu, 30 May 2013)
Log Message:
-----------
Rename TwistedCompatibleLogger -> LegacyLogger.
Export LegacyLogger.

Modified Paths:
--------------
    CalendarServer/trunk/twext/python/log.py

Modified: CalendarServer/trunk/twext/python/log.py
===================================================================
--- CalendarServer/trunk/twext/python/log.py	2013-05-30 17:15:15 UTC (rev 11263)
+++ CalendarServer/trunk/twext/python/log.py	2013-05-30 18:43:41 UTC (rev 11264)
@@ -49,18 +49,17 @@
 #
 # TODO List:
 #
-# * TwistedCompatibleLogger.err is setting isError=0 until we fix our callers
-#
 # * Replace message argument with format argument
 #
 
 __all__ = [
+    "InvalidLogLevelError",
     "LogLevel",
     "logLevelForNamespace",
     "setLogLevelForNamespace",
     "clearLogLevels",
     "Logger",
-    "InvalidLogLevelError",
+    "LegacyLogger",
     "StandardIOObserver",
 ]
 
@@ -77,6 +76,17 @@
 
 
 
+#
+# Log level definitions
+#
+
+class InvalidLogLevelError(RuntimeError):
+    def __init__(self, level):
+        super(InvalidLogLevelError, self).__init__(str(level))
+        self.level = level
+
+
+
 class LogLevel(Names):
     """
     Constants denoting log levels.
@@ -107,9 +117,9 @@
 
 
 
-##
+#
 # Tools for managing log levels
-##
+#
 
 def logLevelForNamespace(namespace):
     """
@@ -294,7 +304,7 @@
 
 
 
-class TwistedCompatibleLogger(Logger):
+class LegacyLogger(Logger):
     def msg(self, *message, **kwargs):
         if message:
             message = " ".join(map(safe_str, message))
@@ -313,10 +323,10 @@
         # existing bugs, should be =1.
 
         if isinstance(_stuff, Failure):
-            self.emit(LogLevel.error, failure=_stuff, why=_why, isError=0, **kwargs)
+            self.emit(LogLevel.error, failure=_stuff, why=_why, isError=1, **kwargs)
         else:
             # We got called with an invalid _stuff.
-            self.emit(LogLevel.error, repr(_stuff), why=_why, isError=0, **kwargs)
+            self.emit(LogLevel.error, repr(_stuff), why=_why, isError=1, **kwargs)
 
 
 
@@ -347,20 +357,10 @@
 del level
 
 
-##
-# Errors
-##
 
-class InvalidLogLevelError(RuntimeError):
-    def __init__(self, level):
-        super(InvalidLogLevelError, self).__init__(str(level))
-        self.level = level
-
-
-
-##
+#
 # Observers
-##
+#
 
 class StandardIOObserver(object):
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130530/889f23ae/attachment.html>