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

[source_changes at macosforge.org]

Revision: 12655
          http://trac.calendarserver.org//changeset/12655
Author:   wsanchez at apple.com
Date:     2014-02-11 14:17:05 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Add access to the observer

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

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-11 21:20:48 UTC (rev 12654)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-11 22:17:05 UTC (rev 12655)
@@ -147,7 +147,7 @@
         start = self._start
         messageID = None
 
-        for eventClass, event in self._source.events:
+        for observer, eventClass, event in tuple(self._source.events):
             messageID = id(event)
 
             # If we have a start point, skip messages up to and including the
@@ -165,6 +165,7 @@
                 message = event["log-format"] % event
             else:
                 message = textFromEventDict(event)
+                # message = observer.formatEvent(event)
                 if message is None:
                     continue
 
@@ -202,25 +203,31 @@
     """
 
     def __init__(self, buffer):
-        class DeadIO(object):
+        class FooIO(object):
             @staticmethod
             def write(s):
-                pass
+                self._lastMessage = s
 
             @staticmethod
             def flush():
                 pass
 
-        FileLogObserver.__init__(self, DeadIO)
+        FileLogObserver.__init__(self, FooIO)
 
+        self.lastMessage = None
         self._buffer = buffer
 
 
     def emit(self, event):
-        self._buffer.append((u"server", event))
+        self._buffer.append((self, u"server", event))
 
 
+    def formatEvent(self, event):
+        self._lastMessage = None
+        BufferingLogObserver.emit(self, event)
+        return self._lastMessage
 
+
 class AccessLogObserver(CommonAccessLoggingObserverExtensions):
     """
     Log observer that captures apache-style access log text entries in a
@@ -241,7 +248,7 @@
         if event["type"] != "access-log":
             return
 
-        self._buffer.append((u"access", event))
+        self._buffer.append((self, u"access", event))
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/06627b19/attachment.html>