[CalendarServer-changes] [1180] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1180
          http://trac.macosforge.org/projects/calendarserver/changeset/1180
Author:   cdaboo at apple.com
Date:     2007-02-13 09:58:24 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Add millisecond response time to access log.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch
    CalendarServer/trunk/twistedcaldav/logging.py

Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2007-02-13 02:10:27 UTC (rev 1179)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch	2007-02-13 17:58:24 UTC (rev 1180)
@@ -10,7 +10,17 @@
  
  from twisted.web2 import version as web2_version
  from twisted import __version__ as twisted_version
-@@ -150,17 +151,32 @@
+@@ -143,6 +144,9 @@
+                        error.defaultErrorHandler, defaultHeadersFilter]
+     
+     def __init__(self, *args, **kw):
++        
++        self.initTime = time.time()
++
+         if kw.has_key('site'):
+             self.site = kw['site']
+             del kw['site']
+@@ -150,17 +154,32 @@
              self._initialprepath = kw['prepathuri']
              del kw['prepathuri']
  
@@ -46,7 +56,7 @@
  
      def unparseURL(self, scheme=None, host=None, port=None,
                     path=None, params=None, querystring=None, fragment=None):
-@@ -265,6 +281,7 @@
+@@ -265,6 +284,7 @@
          
          d = defer.Deferred()
          d.addCallback(self._getChild, self.site.resource, self.postpath)
@@ -54,7 +64,7 @@
          d.addCallback(lambda res, req: res.renderHTTP(req), self)
          d.addCallback(self._cbFinishRender)
          d.addErrback(self._processingFailed)
-@@ -320,8 +337,6 @@
+@@ -320,8 +340,6 @@
                      url = "/" + "/".join(path)
                  else:
                      url = "/"
@@ -63,7 +73,7 @@
                  return res
              #else:
              #    raise ValueError("locateChild must not return StopTraversal with a resource other than self.")
-@@ -342,17 +357,16 @@
+@@ -342,17 +360,16 @@
                  self.prepath.append(self.postpath.pop(0))
  
          child = self._getChild(None, newres, newpath, updatepaths=updatepaths)
@@ -85,7 +95,7 @@
  
      def urlForResource(self, resource):
          """
-@@ -367,10 +381,7 @@
+@@ -367,10 +384,7 @@
  
          @return: the URL of C{resource} if known, otherwise C{None}.
          """
@@ -97,7 +107,7 @@
  
      def locateResource(self, url):
          """
-@@ -385,7 +396,8 @@
+@@ -385,7 +399,8 @@
              The contained response will have a status code of
              L{responsecode.BAD_REQUEST}.
          """
@@ -107,7 +117,7 @@
  
          #
          # Parse the URL
-@@ -406,19 +418,71 @@
+@@ -406,19 +421,71 @@
                  "URL is not on this site (%s://%s/): %s" % (scheme, self.headers.getHeader("host"), url)
              ))
  

Modified: CalendarServer/trunk/twistedcaldav/logging.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/logging.py	2007-02-13 02:10:27 UTC (rev 1179)
+++ CalendarServer/trunk/twistedcaldav/logging.py	2007-02-13 17:58:24 UTC (rev 1180)
@@ -141,7 +141,7 @@
         
 
         self.logMessage(
-            '%s - %s [%s] "%s" %s %d "%s" "%s"' %(
+            '%s - %s [%s] "%s" %s %d "%s" "%s" [%.1f ms]' %(
                 request.remoteAddr.host,
                 uid,
                 self.logDateString(
@@ -150,7 +150,8 @@
                 response.code,
                 loginfo.bytesSent,
                 request.headers.getHeader('referer', '-'),
-                request.headers.getHeader('user-agent', '-')
+                request.headers.getHeader('user-agent', '-'),
+                (time.time() - request.initTime) * 1000,
                 )
             )
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070213/784d22a0/attachment.html