[CalendarServer-changes] [12657] CalendarServer/trunk/calendarserver/webadmin/logs.py

[source_changes at macosforge.org]

Revision: 12657
          http://trac.calendarserver.org//changeset/12657
Author:   wsanchez at apple.com
Date:     2014-02-11 14:57:51 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Reply on FLO emit() for line formatting.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/logs.py

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-11 22:57:28 UTC (rev 12656)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-11 22:57:51 UTC (rev 12657)
@@ -30,7 +30,7 @@
 
 from zope.interface import implementer
 
-from twisted.python.log import FileLogObserver, textFromEventDict
+from twisted.python.log import FileLogObserver
 from twisted.internet.defer import succeed
 
 from txweb2.stream import IByteStream, fallbackSplit
@@ -164,8 +164,7 @@
             if eventClass == u"access":
                 message = event["log-format"] % event
             else:
-                message = textFromEventDict(event)
-                # message = observer.formatEvent(event)
+                message = observer.formatEvent(event)
                 if message is None:
                     continue
 
@@ -204,15 +203,13 @@
 
     def __init__(self, buffer):
         class FooIO(object):
-            @staticmethod
-            def write(s):
+            def write(_, s):
                 self._lastMessage = s
 
-            @staticmethod
-            def flush():
+            def flush(_):
                 pass
 
-        FileLogObserver.__init__(self, FooIO)
+        FileLogObserver.__init__(self, FooIO())
 
         self.lastMessage = None
         self._buffer = buffer
@@ -224,7 +221,7 @@
 
     def formatEvent(self, event):
         self._lastMessage = None
-        BufferingLogObserver.emit(self, event)
+        FileLogObserver.emit(self, event)
         return self._lastMessage
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/1a96f63f/attachment.html>