[CalendarServer-changes] [11322] CalendarServer/trunk/contrib/tools/readStats.py

[source_changes at macosforge.org]

Revision: 11322
          http://trac.calendarserver.org//changeset/11322
Author:   cdaboo at apple.com
Date:     2013-06-06 11:13:06 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
Fix bug when polling a single server.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/tools/readStats.py

Modified: CalendarServer/trunk/contrib/tools/readStats.py
===================================================================
--- CalendarServer/trunk/contrib/tools/readStats.py	2013-06-06 02:02:08 UTC (rev 11321)
+++ CalendarServer/trunk/contrib/tools/readStats.py	2013-06-06 18:13:06 UTC (rev 11322)
@@ -303,15 +303,15 @@
     for i in ("T", "T-RESP-WR",):
         table.addRow((
             "Overall Response" if i == "T" else "Response Write",
-            (stat[i]["<10ms"], safeDivision(stat[i]["<10ms"], stat[i]["requests"], 100.0)),
-            (stat[i]["10ms<->100ms"], safeDivision(stat[i]["10ms<->100ms"], stat[i]["requests"], 100.0)),
-            (stat[i]["100ms<->1s"], safeDivision(stat[i]["100ms<->1s"], stat[i]["requests"], 100.0)),
-            (stat[i]["1s<->10s"], safeDivision(stat[i]["1s<->10s"], stat[i]["requests"], 100.0)),
-            (stat[i]["10s<->30s"], safeDivision(stat[i]["10s<->30s"], stat[i]["requests"], 100.0)),
-            (stat[i]["30s<->60s"], safeDivision(stat[i]["30s<->60s"], stat[i]["requests"], 100.0)),
-            (stat[i][">60s"], safeDivision(stat[i][">60s"], stat[i]["requests"], 100.0)),
-            safeDivision(stat[i]["Over 1s"], stat[i]["requests"], 100.0),
-            safeDivision(stat[i]["Over 10s"], stat[i]["requests"], 100.0),
+            (stat[i]["<10ms"], safeDivision(stat[i]["<10ms"], stat["requests"], 100.0)),
+            (stat[i]["10ms<->100ms"], safeDivision(stat[i]["10ms<->100ms"], stat["requests"], 100.0)),
+            (stat[i]["100ms<->1s"], safeDivision(stat[i]["100ms<->1s"], stat["requests"], 100.0)),
+            (stat[i]["1s<->10s"], safeDivision(stat[i]["1s<->10s"], stat["requests"], 100.0)),
+            (stat[i]["10s<->30s"], safeDivision(stat[i]["10s<->30s"], stat["requests"], 100.0)),
+            (stat[i]["30s<->60s"], safeDivision(stat[i]["30s<->60s"], stat["requests"], 100.0)),
+            (stat[i][">60s"], safeDivision(stat[i][">60s"], stat["requests"], 100.0)),
+            safeDivision(stat[i]["Over 1s"], stat["requests"], 100.0),
+            safeDivision(stat[i]["Over 10s"], stat["requests"], 100.0),
         ))
     os = StringIO()
     table.printTable(os=os)
@@ -322,16 +322,17 @@
 def printMultiHistogramSummary(stats, index):
 
     # Totals first
-    keys = ("requests", "<10ms", "10ms<->100ms", "100ms<->1s", "1s<->10s", "10s<->30s", "30s<->60s", ">60s", "Over 1s", "Over 10s",)
+    keys = ("<10ms", "10ms<->100ms", "100ms<->1s", "1s<->10s", "10s<->30s", "30s<->60s", ">60s", "Over 1s", "Over 10s",)
     totals = {
         "T"        : dict([(k, 0) for k in keys]),
         "T-RESP-WR": dict([(k, 0) for k in keys]),
+        "requests" : 0,
     }
 
     for stat in stats:
         for i in ("T", "T-RESP-WR",):
-            totals[i][keys[0]] += stat[index][keys[0]]
-            for k in keys[1:]:
+            totals["requests"] += stat[index]["requests"]
+            for k in keys:
                 totals[i][k] += stat[index][i][k]
 
     printHistogramSummary(totals, index)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130606/f206e8e2/attachment.html>