[CalendarServer-changes] [1567]
CalendarServer/trunk/twistedcaldav/admin
source_changes at macosforge.org
source_changes at macosforge.org
Thu May 24 09:55:04 PDT 2007
Revision: 1567
http://trac.macosforge.org/projects/calendarserver/changeset/1567
Author: cdaboo at apple.com
Date: 2007-05-24 09:55:04 -0700 (Thu, 24 May 2007)
Log Message:
-----------
Also track the status response by logging Ok, bad, failed (internal server error), and other statistics for each request method.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/admin/formatters.py
CalendarServer/trunk/twistedcaldav/admin/logs.py
Modified: CalendarServer/trunk/twistedcaldav/admin/formatters.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 16:39:24 UTC (rev 1566)
+++ CalendarServer/trunk/twistedcaldav/admin/formatters.py 2007-05-24 16:55:04 UTC (rev 1567)
@@ -177,6 +177,10 @@
fields = (
'method',
'num',
+ 'numOK',
+ 'numBAD',
+ 'numISE',
+ 'numOther',
'minbytes',
'avbytes',
'maxbytes',
@@ -185,8 +189,12 @@
'maxtime',
)
headings = {
- 'method': 'Method ',
- 'num': '# Requests ',
+ 'method': 'Method',
+ 'num': '# Requests',
+ 'numOK': ' # OK',
+ 'numBAD': ' # BAD',
+ 'numISE': ' # Failed',
+ 'numOther': ' # Other',
'minbytes': 'Min. bytes',
'avbytes': ' Av. bytes',
'maxbytes': 'Max. bytes',
Modified: CalendarServer/trunk/twistedcaldav/admin/logs.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 16:39:24 UTC (rev 1566)
+++ CalendarServer/trunk/twistedcaldav/admin/logs.py 2007-05-24 16:55:04 UTC (rev 1567)
@@ -56,10 +56,18 @@
def addBytes(self, bytes):
self._data.bytesOut += bytes
- def addRequestStats(self, request, bytes, time):
+ def addRequestStats(self, request, status, bytes, time):
if request in self._data.requestStats:
old_num = self._data.requestStats[request]['num']
self._data.requestStats[request]['num'] = old_num + 1
+ if status >= 200 and status < 300:
+ self._data.requestStats[request]['numOK'] = self._data.requestStats[request]['numOK'] + 1
+ elif status == 500:
+ self._data.requestStats[request]['numISE'] = self._data.requestStats[request]['numISE'] + 1
+ elif status >= 400 and status < 600:
+ self._data.requestStats[request]['numBAD'] = self._data.requestStats[request]['numBAD'] + 1
+ else:
+ self._data.requestStats[request]['numOther'] = self._data.requestStats[request]['numOther'] + 1
if bytes < self._data.requestStats[request]['minbytes']:
self._data.requestStats[request]['minbytes'] = bytes
if bytes > self._data.requestStats[request]['maxbytes']:
@@ -73,6 +81,18 @@
else:
self._data.requestStats[request] = {}
self._data.requestStats[request]['num'] = 1
+ self._data.requestStats[request]['numOK'] = 0
+ self._data.requestStats[request]['numBAD'] = 0
+ self._data.requestStats[request]['numISE'] = 0
+ self._data.requestStats[request]['numOther'] = 0
+ if status >= 200 and status < 300:
+ self._data.requestStats[request]['numOK'] = 1
+ elif status == 500:
+ self._data.requestStats[request]['numISE'] = 1
+ elif status >= 400 and status < 600:
+ self._data.requestStats[request]['numBAD'] = 1
+ else:
+ self._data.requestStats[request]['numOther'] = 1
self._data.requestStats[request]['minbytes'] = bytes
self._data.requestStats[request]['maxbytes'] = bytes
self._data.requestStats[request]['avbytes'] = bytes
@@ -159,7 +179,7 @@
pline = parseCLFLine(line)
self.stats.addBytes(int(pline[6]))
- self.stats.addRequestStats(pline[4].split(' ')[0], int(pline[6]), float(pline[9][:-3]))
+ self.stats.addRequestStats(pline[4].split(' ')[0], int(pline[5]), int(pline[6]), float(pline[9][:-3]))
if len(pline) > 7:
self.stats.addUserAgent(pline[8])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070524/09f5a96a/attachment.html
More information about the calendarserver-changes
mailing list