[CalendarServer-changes] [12775] CalendarServer/trunk/calendarserver/webadmin/logs.py
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 27 16:51:41 PST 2014
Revision: 12775
http://trac.calendarserver.org//changeset/12775
Author: wsanchez at apple.com
Date: 2014-02-27 16:51:41 -0800 (Thu, 27 Feb 2014)
Log Message:
-----------
cosmetic
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/webadmin/logs.py
Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-02-28 00:24:11 UTC (rev 12774)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py 2014-02-28 00:51:41 UTC (rev 12775)
@@ -68,42 +68,6 @@
- at implementer(IEventDecoder)
-class EventDecoder(object):
- """
- Decodes logging events.
- """
-
- @staticmethod
- def idForEvent(event):
- observer, eventClass, logEvent = event
- return id(logEvent)
-
-
- @staticmethod
- def classForEvent(event):
- observer, eventClass, logEvent = event
- return eventClass
-
-
- @staticmethod
- def textForEvent(event):
- observer, eventClass, logEvent = event
-
- try:
- if eventClass == u"access":
- text = logEvent[u"log-format"] % logEvent
- else:
- text = observer.formatEvent(logEvent)
- if text is None:
- text = u""
- except:
- text = u"*** Error while formatting event ***"
-
- return text
-
-
-
class LogEventsResource(EventSourceResource):
"""
Log event vending resource.
@@ -180,3 +144,39 @@
return
self._resource.addEvents(((self, u"access", event),))
+
+
+
+ at implementer(IEventDecoder)
+class EventDecoder(object):
+ """
+ Decodes logging events.
+ """
+
+ @staticmethod
+ def idForEvent(event):
+ observer, eventClass, logEvent = event
+ return id(logEvent)
+
+
+ @staticmethod
+ def classForEvent(event):
+ observer, eventClass, logEvent = event
+ return eventClass
+
+
+ @staticmethod
+ def textForEvent(event):
+ observer, eventClass, logEvent = event
+
+ try:
+ if eventClass == u"access":
+ text = logEvent[u"log-format"] % logEvent
+ else:
+ text = observer.formatEvent(logEvent)
+ if text is None:
+ text = u""
+ except:
+ text = u"*** Error while formatting event ***"
+
+ return text
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140227/7b94486f/attachment-0001.html>
More information about the calendarserver-changes
mailing list