[CalendarServer-changes] [4936] CalendarServer/branches/users/sagen/deployment-inspection/ twistedcaldav/accesslog.py

source_changes at macosforge.org source_changes at macosforge.org
Sun Jan 17 15:26:44 PST 2010


Revision: 4936
          http://trac.macosforge.org/projects/calendarserver/changeset/4936
Author:   sagen at apple.com
Date:     2010-01-17 15:26:41 -0800 (Sun, 17 Jan 2010)
Log Message:
-----------
Logs X-Forwarded-For header(s)

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/deployment-inspection/twistedcaldav/accesslog.py

Modified: CalendarServer/branches/users/sagen/deployment-inspection/twistedcaldav/accesslog.py
===================================================================
--- CalendarServer/branches/users/sagen/deployment-inspection/twistedcaldav/accesslog.py	2010-01-17 22:30:50 UTC (rev 4935)
+++ CalendarServer/branches/users/sagen/deployment-inspection/twistedcaldav/accesslog.py	2010-01-17 23:26:41 UTC (rev 4936)
@@ -141,6 +141,15 @@
                         if " " in v:
                             v = '"%s"' % (v,)
                         formats.append("%s=%s" % (k, v))
+
+                fwdHeaders = request.headers.getRawHeaders("x-forwarded-for", "")
+                if fwdHeaders:
+                    forwardedFor = ",".join(fwdHeaders)
+                    forwardedFor = forwardedFor.replace(" ", "")
+                    formats.append("fwd=%(fwd)s")
+                else:
+                    forwardedFor = ""
+
                 format = " ".join(formats)
 
             formatArgs = {
@@ -157,6 +166,8 @@
                 "serverInstance"      : serverInstance,
                 "timeSpent"           : (time.time() - request.initTime) * 1000,
                 "outstandingRequests" : request.chanRequest.channel.factory.outstandingRequests,
+                "outstandingRequests" : request.chanRequest.channel.factory.outstandingRequests,
+                "fwd"                 : forwardedFor,
             }
             self.logMessage(format % formatArgs)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100117/49e81a49/attachment-0001.html>


More information about the calendarserver-changes mailing list