<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[11322] CalendarServer/trunk/contrib/tools/readStats.py</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/11322">11322</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2013-06-06 11:13:06 -0700 (Thu, 06 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix bug when polling a single server.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribtoolsreadStatspy">CalendarServer/trunk/contrib/tools/readStats.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribtoolsreadStatspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/tools/readStats.py (11321 => 11322)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -303,15 +303,15 @@
</span><span class="cx">     for i in (&quot;T&quot;, &quot;T-RESP-WR&quot;,):
</span><span class="cx">         table.addRow((
</span><span class="cx">             &quot;Overall Response&quot; if i == &quot;T&quot; else &quot;Response Write&quot;,
</span><del>-            (stat[i][&quot;&lt;10ms&quot;], safeDivision(stat[i][&quot;&lt;10ms&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            (stat[i][&quot;10ms&lt;-&gt;100ms&quot;], safeDivision(stat[i][&quot;10ms&lt;-&gt;100ms&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            (stat[i][&quot;100ms&lt;-&gt;1s&quot;], safeDivision(stat[i][&quot;100ms&lt;-&gt;1s&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            (stat[i][&quot;1s&lt;-&gt;10s&quot;], safeDivision(stat[i][&quot;1s&lt;-&gt;10s&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            (stat[i][&quot;10s&lt;-&gt;30s&quot;], safeDivision(stat[i][&quot;10s&lt;-&gt;30s&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            (stat[i][&quot;30s&lt;-&gt;60s&quot;], safeDivision(stat[i][&quot;30s&lt;-&gt;60s&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            (stat[i][&quot;&gt;60s&quot;], safeDivision(stat[i][&quot;&gt;60s&quot;], stat[i][&quot;requests&quot;], 100.0)),
-            safeDivision(stat[i][&quot;Over 1s&quot;], stat[i][&quot;requests&quot;], 100.0),
-            safeDivision(stat[i][&quot;Over 10s&quot;], stat[i][&quot;requests&quot;], 100.0),
</del><ins>+            (stat[i][&quot;&lt;10ms&quot;], safeDivision(stat[i][&quot;&lt;10ms&quot;], stat[&quot;requests&quot;], 100.0)),
+            (stat[i][&quot;10ms&lt;-&gt;100ms&quot;], safeDivision(stat[i][&quot;10ms&lt;-&gt;100ms&quot;], stat[&quot;requests&quot;], 100.0)),
+            (stat[i][&quot;100ms&lt;-&gt;1s&quot;], safeDivision(stat[i][&quot;100ms&lt;-&gt;1s&quot;], stat[&quot;requests&quot;], 100.0)),
+            (stat[i][&quot;1s&lt;-&gt;10s&quot;], safeDivision(stat[i][&quot;1s&lt;-&gt;10s&quot;], stat[&quot;requests&quot;], 100.0)),
+            (stat[i][&quot;10s&lt;-&gt;30s&quot;], safeDivision(stat[i][&quot;10s&lt;-&gt;30s&quot;], stat[&quot;requests&quot;], 100.0)),
+            (stat[i][&quot;30s&lt;-&gt;60s&quot;], safeDivision(stat[i][&quot;30s&lt;-&gt;60s&quot;], stat[&quot;requests&quot;], 100.0)),
+            (stat[i][&quot;&gt;60s&quot;], safeDivision(stat[i][&quot;&gt;60s&quot;], stat[&quot;requests&quot;], 100.0)),
+            safeDivision(stat[i][&quot;Over 1s&quot;], stat[&quot;requests&quot;], 100.0),
+            safeDivision(stat[i][&quot;Over 10s&quot;], stat[&quot;requests&quot;], 100.0),
</ins><span class="cx">         ))
</span><span class="cx">     os = StringIO()
</span><span class="cx">     table.printTable(os=os)
</span><span class="lines">@@ -322,16 +322,17 @@
</span><span class="cx"> def printMultiHistogramSummary(stats, index):
</span><span class="cx"> 
</span><span class="cx">     # Totals first
</span><del>-    keys = (&quot;requests&quot;, &quot;&lt;10ms&quot;, &quot;10ms&lt;-&gt;100ms&quot;, &quot;100ms&lt;-&gt;1s&quot;, &quot;1s&lt;-&gt;10s&quot;, &quot;10s&lt;-&gt;30s&quot;, &quot;30s&lt;-&gt;60s&quot;, &quot;&gt;60s&quot;, &quot;Over 1s&quot;, &quot;Over 10s&quot;,)
</del><ins>+    keys = (&quot;&lt;10ms&quot;, &quot;10ms&lt;-&gt;100ms&quot;, &quot;100ms&lt;-&gt;1s&quot;, &quot;1s&lt;-&gt;10s&quot;, &quot;10s&lt;-&gt;30s&quot;, &quot;30s&lt;-&gt;60s&quot;, &quot;&gt;60s&quot;, &quot;Over 1s&quot;, &quot;Over 10s&quot;,)
</ins><span class="cx">     totals = {
</span><span class="cx">         &quot;T&quot;        : dict([(k, 0) for k in keys]),
</span><span class="cx">         &quot;T-RESP-WR&quot;: dict([(k, 0) for k in keys]),
</span><ins>+        &quot;requests&quot; : 0,
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     for stat in stats:
</span><span class="cx">         for i in (&quot;T&quot;, &quot;T-RESP-WR&quot;,):
</span><del>-            totals[i][keys[0]] += stat[index][keys[0]]
-            for k in keys[1:]:
</del><ins>+            totals[&quot;requests&quot;] += stat[index][&quot;requests&quot;]
+            for k in keys:
</ins><span class="cx">                 totals[i][k] += stat[index][i][k]
</span><span class="cx"> 
</span><span class="cx">     printHistogramSummary(totals, index)
</span></span></pre>
</div>
</div>

</body>
</html>