[CalendarServer-changes] [3236] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Oct 27 11:17:17 PDT 2008
Revision: 3236
http://trac.macosforge.org/projects/calendarserver/changeset/3236
Author: cdaboo at apple.com
Date: 2008-10-27 11:17:17 -0700 (Mon, 27 Oct 2008)
Log Message:
-----------
Add option to include some extra information in the access.log - the instance port number and number of
outstanding requests.
Modified Paths:
--------------
CalendarServer/trunk/conf/caldavd-test.plist
CalendarServer/trunk/twistedcaldav/accesslog.py
CalendarServer/trunk/twistedcaldav/config.py
Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist 2008-10-27 17:59:17 UTC (rev 3235)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2008-10-27 18:17:17 UTC (rev 3236)
@@ -290,6 +290,8 @@
<string>logs/access.log</string>
<key>RotateAccessLog</key>
<false/>
+ <key>MoreAccessLogData</key>
+ <true/>
<!-- Server activity log -->
<key>ErrorLogFile</key>
Modified: CalendarServer/trunk/twistedcaldav/accesslog.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/accesslog.py 2008-10-27 17:59:17 UTC (rev 3235)
+++ CalendarServer/trunk/twistedcaldav/accesslog.py 2008-10-27 18:17:17 UTC (rev 3236)
@@ -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/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py 2008-10-27 17:59:17 UTC (rev 3235)
+++ CalendarServer/trunk/twistedcaldav/config.py 2008-10-27 18:17:17 UTC (rev 3236)
@@ -136,9 +136,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/20081027/8956fb55/attachment.html>
More information about the calendarserver-changes
mailing list