[CalendarServer-changes] [11499] CalendarServer/trunk/twext/web2/log.py

[source_changes at macosforge.org]

Revision: 11499
          http://trac.calendarserver.org//changeset/11499
Author:   wsanchez at apple.com
Date:     2013-07-10 11:50:26 -0700 (Wed, 10 Jul 2013)
Log Message:
-----------
Use new-style logging and wire up to the rootPublisher so that access.log events are not filtered.

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

Modified: CalendarServer/trunk/twext/web2/log.py
===================================================================
--- CalendarServer/trunk/twext/web2/log.py	2013-07-10 18:49:49 UTC (rev 11498)
+++ CalendarServer/trunk/twext/web2/log.py	2013-07-10 18:50:26 UTC (rev 11499)
@@ -23,14 +23,20 @@
 #
 ##
 
-"""Logging tools. This is still in flux (even moreso than the rest of web2)."""
+"""
+Logging tools. This is still in flux (even moreso than the rest of web2).
 
+NOTE: This is now using twext.python.log new-style logging and observers.
+"""
+
 import time
-from twisted.python import log
 from twisted.internet import defer
+from twext.python.log import Logger
 from twext.web2 import iweb, stream, resource
 from zope.interface import implements, Attribute, Interface
 
+log = Logger()
+
 class _LogByteCounter(object):
     implements(stream.IByteStream)
     
@@ -93,8 +99,8 @@
 
         if length:        
             request.timeStamp("t-resp-wr")
-        log.msg(interface=iweb.IRequest, request=request, response=response,
-                loginfo=loginfo)
+        log.info(interface=iweb.IRequest, request=request, response=response,
+                 loginfo=loginfo)
         # Or just...
         # ILogger(ctx).log(...) ?
 
@@ -127,6 +133,7 @@
     """
 
     logFormat = '%s - %s [%s] "%s" %s %d "%s" "%s"'
+
     def logMessage(self, message):
         raise NotImplemented, 'You must provide an implementation.'
 
@@ -177,7 +184,7 @@
             '.'.join([str(x) for x in request.clientproto]))
         
         self.logMessage(
-            '%s - %s [%s] "%s" %s %d "%s" "%s"' %(
+            '%s - %s [%s] "%s" %s %d "%s" "%s"' % (
                 request.remoteAddr.host,
                 # XXX: Where to get user from?
                 "-",
@@ -193,11 +200,12 @@
 
     def start(self):
         """Start observing log events."""
-        log.addObserver(self.emit)
+        # Use the root publisher to bypass log level filtering
+        log.publisher.rootPublisher.addObserver(self.emit)
 
     def stop(self):
         """Stop observing log events."""
-        log.removeObserver(self.emit)
+        log.publisher.rootPublisher.removeObserver(self.emit)
 
 
 class FileAccessLoggingObserver(BaseCommonAccessLoggingObserver):
@@ -222,4 +230,4 @@
 class DefaultCommonAccessLoggingObserver(BaseCommonAccessLoggingObserver):
     """Log requests to default twisted logfile."""
     def logMessage(self, message):
-        log.msg(message)
+        log.info(message)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130710/4261de86/attachment.html>