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

[source_changes at macosforge.org]

Revision: 11360
          http://trac.calendarserver.org//changeset/11360
Author:   wsanchez at apple.com
Date:     2013-06-13 17:33:00 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
Expose the root publisher as Logger.publisher.
LegacyFormatStub.__str__() should return bytes, not unicode.

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

Modified: CalendarServer/trunk/twext/python/log.py
===================================================================
--- CalendarServer/trunk/twext/python/log.py	2013-06-14 00:19:16 UTC (rev 11359)
+++ CalendarServer/trunk/twext/python/log.py	2013-06-14 00:33:00 UTC (rev 11360)
@@ -51,11 +51,11 @@
 # TODO List:
 #
 # * Expose the default log observer (TheLogPublisher)
-# * Specifically, expose addObserver and removeObserver so one can register other observers
-# * Check the unicode situation for sanity
+#  * Specifically, expose addObserver and removeObserver so one can register other observers
 # * Change the default log observer to something non-legacy
-# * Register a legacy observer with Twisted's logging that forwards to this module
-# * Monkey patch logging in Twisted to use our LegacyLogger to sprinkle betterness everywhere
+#  * Register a legacy observer with Twisted's logging that forwards to this module
+#  * Monkey patch logging in Twisted to use our LegacyLogger to sprinkle betterness everywhere
+# * Move namespace settings to Filter class
 #
 
 __all__ = [
@@ -375,7 +375,7 @@
             log_time      = time.time(),
         )
 
-        TheLogPublisher(event)
+        self.publisher(event)
 
 
     def failure(self, format, failure=None, level=LogLevel.error, **kwargs):
@@ -640,7 +640,7 @@
             #
             class LegacyFormatStub(object):
                 def __str__(self):
-                    return self.formatEvent(event)
+                    return self.formatEvent(event).encode("utf-8")
 
             event["format"] = prefix + "%(log_legacy)s"
             event["log_legacy"] = LegacyFormatStub()
@@ -711,13 +711,15 @@
 # Default observers
 # FIXME: ...
 #
-TheLegacyLogObserver = LegacyLogObserverWrapper(twistedLogMessage)
-TheFilteredLogPublisher = LogPublisher(TheLegacyLogObserver) # Add post-filtering observers here
-TheFilteringLogObserver = LogLevelFilteringLogObserverWrapper(TheFilteredLogPublisher)
-TheLogPublisher = LogPublisher(TheFilteringLogObserver) # Add pre-filtering observers here
+theLegacyLogObserver = LegacyLogObserverWrapper(twistedLogMessage)
 
+theFilteredLogPublisher = LogPublisher(theLegacyLogObserver) # Add post-filtering observers here
+theFilteringLogObserver = LogLevelFilteringLogObserverWrapper(theFilteredLogPublisher)
+theLogPublisher = LogPublisher(theFilteringLogObserver) # Add pre-filtering observers here
 
+Logger.publisher = theLogPublisher
 
+
 ######################################################################
 # FIXME: This may not be needed; look into removing it.
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130613/e5ed7637/attachment.html>