[CalendarServer-changes] [3331] CalendarServer/branches/users/wsanchez/deployment

[source_changes at macosforge.org]

Revision: 3331
          http://trac.macosforge.org/projects/calendarserver/changeset/3331
Author:   cdaboo at apple.com
Date:     2008-11-06 12:51:19 -0800 (Thu, 06 Nov 2008)
Log Message:
-----------
Merged r3236 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/accesslog.py
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py

Modified: CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist	2008-11-06 19:58:27 UTC (rev 3330)
+++ CalendarServer/branches/users/wsanchez/deployment/conf/caldavd-test.plist	2008-11-06 20:51:19 UTC (rev 3331)
@@ -285,6 +285,8 @@
    <string>debug</string>
  -->
   </dict>
+	<key>MoreAccessLogData</key>
+	<true/>
 
   <!-- Accounting -->
   <key>AccountingCategories</key>

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/accesslog.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/accesslog.py	2008-11-06 19:58:27 UTC (rev 3330)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/accesslog.py	2008-11-06 20:51:19 UTC (rev 3331)
@@ -99,20 +99,26 @@
                 else:
                     uid = uidn
 
-        self.logMessage(
-            '%s - %s [%s] "%s" %s %d "%s" "%s" [%.1f ms]' %(
-                request.remoteAddr.host,
-                uid,
-                self.logDateString(
-                    response.headers.getHeader('date', 0)),
-                firstLine,
-                response.code,
-                loginfo.bytesSent,
-                request.headers.getHeader('referer', '-'),
-                request.headers.getHeader('user-agent', '-'),
-                (time.time() - request.initTime) * 1000,
-                )
+        format_str = '%s - %s [%s] "%s" %s %d "%s" "%s" [%.1f ms]'
+        format_data = (
+            request.remoteAddr.host,
+            uid,
+            self.logDateString(
+                response.headers.getHeader('date', 0)),
+            firstLine,
+            response.code,
+            loginfo.bytesSent,
+            request.headers.getHeader('referer', '-'),
+            request.headers.getHeader('user-agent', '-'),
+            (time.time() - request.initTime) * 1000,
+        )
+        if config.MoreAccessLogData:
+            format_str += ' [%d %d]'
+            format_data += (
+                request.chanRequest.transport.server.port,
+                request.chanRequest.channel.factory.outstandingRequests,
             )
+        self.logMessage(format_str % format_data)
 
 
 class RotatingFileAccessLoggingObserver(CommonAccessLoggingObserverExtensions):

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py	2008-11-06 19:58:27 UTC (rev 3330)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/config.py	2008-11-06 20:51:19 UTC (rev 3331)
@@ -128,9 +128,10 @@
     "ErrorLogFile"   : "/var/log/caldavd/error.log",   # Server activity log
     "ServerStatsFile": "/var/run/caldavd/stats.plist",
     "PIDFile"        : "/var/run/caldavd.pid",
-    "RotateAccessLog": False,
-    "DefaultLogLevel": "",
-    "LogLevels": {},
+    "RotateAccessLog"   : False,
+    "MoreAccessLogData" : False,
+    "DefaultLogLevel"   : "",
+    "LogLevels"         : {},
     "AccountingCategories": {
         "iTIP": False,
     },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081106/81aeb5cd/attachment.html>