<!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>[12789] CalendarServer/trunk/calendarserver/webadmin</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/12789">12789</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-03 17:54:58 -0800 (Mon, 03 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stream job data to the chart.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkpy">CalendarServer/trunk/calendarserver/webadmin/work.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminworkxhtml">CalendarServer/trunk/calendarserver/webadmin/work.xhtml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.py (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-04 01:39:50 UTC (rev 12788)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-04 01:54:58 UTC (rev 12789)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">     &quot;WorkMonitorResource&quot;,
</span><span class="cx"> ]
</span><span class="cx"> 
</span><ins>+from time import time
</ins><span class="cx"> from json import dumps
</span><span class="cx"> 
</span><span class="cx"> from zope.interface import implementer
</span><span class="lines">@@ -93,7 +94,6 @@
</span><span class="cx"> 
</span><span class="cx">         self._store = store
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def render(self, request):
</span><span class="cx">         yield self.poll()
</span><span class="lines">@@ -104,68 +104,24 @@
</span><span class="cx">     def poll(self):
</span><span class="cx">         txn = self._store.newTransaction()
</span><span class="cx"> 
</span><del>-        payload = {}
</del><ins>+        jobData = yield JobItem.histogram(txn)
</ins><span class="cx"> 
</span><del>-        records = yield JobItem.histogram(txn)
</del><ins>+        self.addEvents((
+            dict(
+                eventClass=u&quot;work-total&quot;,
+                eventID=time(),
+                eventText=asJSON(jobData),
+            ),
+        ))
</ins><span class="cx"> 
</span><ins>+        if not hasattr(self, &quot;_clock&quot;):
+            from twisted.internet import reactor
+            self._clock = reactor
</ins><span class="cx"> 
</span><ins>+        self._clock.callLater(1, self.poll)
</ins><span class="cx"> 
</span><del>-        # for workDescription, workItemClass, itemAttributes in (
-        #     (
-        #         u&quot;Organizer Request&quot;,
-        #         ScheduleOrganizerWork,
-        #         (
-        #             (&quot;icalendarUid&quot;, &quot;iCalendar UID&quot;),
-        #             (&quot;attendeeCount&quot;, &quot;Attendee Count&quot;),
-        #         ),
-        #     ),
-        #     (
-        #         u&quot;Attendee Reply&quot;,
-        #         ScheduleReplyWork,
-        #         (
-        #             (&quot;icalendarUid&quot;, &quot;iCalendar UID&quot;),
-        #         ),
-        #     ),
-        #     (
-        #         u&quot;Attendee Refresh&quot;,
-        #         ScheduleRefreshWork,
-        #         (
-        #             (&quot;icalendarUid&quot;, &quot;iCalendar UID&quot;),
-        #             (&quot;attendeeCount&quot;, &quot;Attendee Count&quot;),
-        #         ),
-        #     ),
-        # ):
-        #     workItems = yield workItemClass.all(txn)
</del><span class="cx"> 
</span><del>-        #     categoryData = []
</del><span class="cx"> 
</span><del>-        #     for workItem in workItems:
-        #         itemData = {}
-
-        #         for itemAttribute, itemDescription in itemAttributes:
-        #             itemData[itemDescription] = getattr(
-        #                 workItem, itemAttribute
-        #             )
-
-        #         categoryData.append(itemData)
-
-        #     payload[workDescription] = categoryData
-
-        # self.addEvents((
-        #     dict(
-        #         eventClass=u&quot;work&quot;,
-        #         eventText=asJSON(payload),
-        #     ),
-        # ))
-
-        # if not hasattr(self, &quot;_clock&quot;):
-        #     from twisted.internet import reactor
-        #     self._clock = reactor
-
-        # # self._clock.callLater(5, self.poll)
-
-
-
</del><span class="cx"> @implementer(IEventDecoder)
</span><span class="cx"> class EventDecoder(object):
</span><span class="cx">     @staticmethod
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12788 => 12789)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-04 01:39:50 UTC (rev 12788)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-04 01:54:58 UTC (rev 12789)
</span><span class="lines">@@ -26,26 +26,82 @@
</span><span class="cx">     &lt;script src=&quot;http://d3js.org/d3.v3.min.js&quot;&gt;&lt;/script&gt;
</span><span class="cx">     &lt;script&gt;
</span><span class="cx"> 
</span><ins>+      var workTableDescriptions = {
+        // Scheduling
+        &quot;SCHEDULE_ORGANIZER_WORK&quot;: &quot;Schedule Organizer&quot;,
+        &quot;SCHEDULE_REPLY_WORK&quot;: &quot;Schedule Reply&quot;,
+        &quot;SCHEDULE_REPLY_CANCEL_WORK&quot;: &quot;Schedule Reply (Cancel)&quot;,
+        &quot;SCHEDULE_REFRESH_WORK&quot;: &quot;Schedule Refresh&quot;,
+        &quot;SCHEDULE_AUTO_REPLY_WORK&quot;: &quot;Schedule Auto-reply&quot;,
+
+        // iMIP scheduling
+        &quot;IMIP_POLLING_WORK&quot;: &quot;iMIP Poll&quot;,
+        &quot;IMIP_INVITATION_WORK&quot;: &quot;iMIP Invitation&quot;,
+        &quot;IMIP_REPLY_WORK&quot;: &quot;iMIP Reply&quot;,
+
+        // Group cacher
+        &quot;GROUP_CACHER_POLLING_WORK&quot;: &quot;Group Cache Poll&quot;,
+        &quot;GROUP_REFRESH_WORK&quot;: &quot;Group Refresh&quot;,
+        &quot;GROUP_ATTENDEE_RECONCILIATION_WORK&quot;: &quot;Group Attendee Reconciliation&quot;,
+
+        // Push notifications
+        &quot;PUSH_NOTIFICATION_WORK&quot;: &quot;Push Notification&quot;,
+
+        // Event splitting
+        &quot;CALENDAR_OBJECT_SPLITTER_WORK&quot;: &quot;Event Split&quot;,
+
+        // Inbox cleanup
+        &quot;INBOX_CLEANUP_WORK&quot;: &quot;Inbox Cleanup&quot;,
+        &quot;CLEANUP_ONE_INBOX_WORK&quot;: &quot;Inbox Cleanup: One&quot;,
+
+        // Revision cleanup
+        &quot;REVISION_CLEANUP_WORK&quot;: &quot;Revision Cleanup&quot;,
+        &quot;FIND_MIN_VALID_REVISION_WORK&quot;: &quot;Revision Cleanup: Find Minimum&quot;,
+      };
+
</ins><span class="cx">       function drawChart(data) {
</span><ins>+        items = [];
+
+        // Add items in the order used by workTableDescriptions
+        for (key in workTableDescriptions) {
+          if (key in data) {
+            items.push({
+              name: key,
+              count: data[key],
+              description: workTableDescriptions[key],
+            });
+          }
+        }
+
+        for (key in data) {
+          if (! key in workTableDescriptions) {
+            items.push({
+              name: key,
+              count: data[key],
+              description: key,
+            });
+          }
+        }
+
</ins><span class="cx">         var width = 600;
</span><span class="cx">         var barHeight = 20;
</span><span class="cx"> 
</span><span class="cx">         var scaledWidth =
</span><span class="cx">           d3.scale.linear()
</span><del>-            .domain([0, d3.max(data)])
</del><ins>+            .domain([0, d3.max(items, function(i) { return i.count; })])
</ins><span class="cx">             .range([0, width]);
</span><span class="cx"> 
</span><span class="cx">         var chart =
</span><span class="cx">           d3.select(&quot;#work_queues_chart&quot;)
</span><span class="cx">             .attr(&quot;width&quot;, width)
</span><del>-            .attr(&quot;height&quot;, barHeight * data.length);
</del><ins>+            .attr(&quot;height&quot;, barHeight * items.length);
</ins><span class="cx"> 
</span><span class="cx">         var bars =
</span><span class="cx">           chart.selectAll(&quot;g&quot;)
</span><del>-            .data(data)
</del><ins>+            .data(items);
</ins><span class="cx"> 
</span><span class="cx">         // Enter selection
</span><del>-        bars.enter().append(&quot;g&quot;)
</del><ins>+        bars.enter().append(&quot;g&quot;);
</ins><span class="cx"> 
</span><span class="cx">         // Update selection
</span><span class="cx">         bars.attr(
</span><span class="lines">@@ -54,36 +110,44 @@
</span><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         bars.append(&quot;rect&quot;)
</span><del>-          .attr(&quot;width&quot;, scaledWidth)
</del><ins>+          .attr(&quot;width&quot;, function(i) { return scaledWidth(i.count); })
</ins><span class="cx">           .attr(&quot;height&quot;, barHeight - 1);
</span><span class="cx"> 
</span><span class="cx">         bars.append(&quot;text&quot;)
</span><del>-          .attr(&quot;x&quot;, function(d) { return scaledWidth(d) - 3; })
</del><ins>+          .attr(&quot;x&quot;, function(i) { return scaledWidth(i.count) - 3; })
</ins><span class="cx">           .attr(&quot;y&quot;, barHeight / 2)
</span><span class="cx">           .attr(&quot;dy&quot;, &quot;0.35em&quot;)
</span><del>-          .text(function(d) { return d; });
</del><ins>+          .text(function(i) { return i.count; });
</ins><span class="cx"> 
</span><span class="cx">         // Exit selection
</span><del>-        bars.exit().remove()
</del><ins>+        bars.exit().remove();
</ins><span class="cx">       }
</span><span class="cx"> 
</span><del>-      function updateChart() {
-        drawChart([4, 8, 15, 16, 23, 42]);
-      }
</del><ins>+      function initChart() {
+        data = {};
</ins><span class="cx"> 
</span><del>-      function initChart() {
-        drawChart([1, 2, 3, 4, 8, 15, 16, 23, 42]);
</del><ins>+        for (key in workTableDescriptions) {
+          data[key] = 0;
+        }
+
+        drawChart(data);
</ins><span class="cx">       }
</span><span class="cx"> 
</span><ins>+      function registerForEvents() {
+        var eventSource = new EventSource(&quot;./events&quot;);
</ins><span class="cx"> 
</span><del>-      function initEventSource() {
-        var eventSource = new EventSource(&quot;./events&quot;);
</del><ins>+        eventSource.addEventListener(
+          &quot;work-total&quot;,
+          function(e) { drawChart(JSON.parse(e.data)); },
+          false
+        );
+
</ins><span class="cx">       }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">       window.onload = function() {
</span><span class="cx">         initChart();
</span><del>-        initEventSource();
</del><ins>+        registerForEvents();
</ins><span class="cx">       };
</span><span class="cx"> 
</span><span class="cx">     &lt;/script&gt;
</span><span class="lines">@@ -95,8 +159,6 @@
</span><span class="cx">     &lt;h1&gt;&lt;t:slot name=&quot;title&quot; /&gt;&lt;/h1&gt;
</span><span class="cx"> 
</span><span class="cx">     &lt;svg id=&quot;work_queues_chart&quot; /&gt;
</span><del>-    &lt;br /&gt;
-    &lt;button onclick=&quot;updateChart()&quot;&gt;Update&lt;/button&gt;
</del><span class="cx"> 
</span><span class="cx">   &lt;/body&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>