<!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>[12811] 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/12811">12811</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-04 21:30:22 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start to drill down a bit.</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 (12810 => 12811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-05 05:30:00 UTC (rev 12810)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py        2014-03-05 05:30:22 UTC (rev 12811)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self, store, pollInterval=1000):
</span><del>- EventSourceResource.__init__(self, EventDecoder, bufferSize=1)
</del><ins>+ EventSourceResource.__init__(self, EventDecoder, bufferSize=100)
</ins><span class="cx">
</span><span class="cx"> self._store = store
</span><span class="cx"> self._pollInterval = pollInterval
</span><span class="lines">@@ -108,31 +108,47 @@
</span><span class="cx">
</span><span class="cx"> # Look up all of the jobs
</span><span class="cx">
</span><ins>+ events = []
+
</ins><span class="cx"> itemsByTypeName = {}
</span><span class="cx">
</span><span class="cx"> for item in (yield JobItem.all(txn)):
</span><span class="cx"> itemsByTypeName.setdefault(item.workType, []).append(item)
</span><span class="cx">
</span><del>- totalsByTypeName = dict(
- (workType, len(items))
- for (workType, items) in itemsByTypeName.iteritems()
- )
</del><ins>+ totalsByTypeName = {}
</ins><span class="cx">
</span><span class="cx"> for workType in JobItem.workTypes():
</span><del>- # If this workType isn't in the totals, there are zero of them.
- totalsByTypeName.setdefault(workType.table.model.name, "0")
</del><ins>+ typeName = workType.table.model.name
+ items = itemsByTypeName.get(typeName, [])
+ totalsByTypeName[typeName] = len(items)
+ itemData = []
</ins><span class="cx">
</span><del>- # Send data
</del><ins>+ for item in items:
+ itemData.append(dict(
+ jobID=item.jobID,
+ priority=item.priority,
+ notBefore=item.notBefore.ctime(), # FIXME: Use HTTP format
+ notAfter=item.notAfter,
+ ))
</ins><span class="cx">
</span><del>- self.addEvents((
- dict(
- eventClass=u"work-total",
- eventID=time(),
- eventText=asJSON(totalsByTypeName),
- eventRetry=(self._pollInterval),
- ),
</del><ins>+ if itemData:
+ events.append(dict(
+ eventClass=typeName,
+ eventID=time(),
+ eventText=asJSON(itemData),
+ ))
+
+ events.append(dict(
+ eventClass=u"work-total",
+ eventID=time(),
+ eventText=asJSON(totalsByTypeName),
+ eventRetry=(self._pollInterval),
</ins><span class="cx"> ))
</span><span class="cx">
</span><ins>+ # Send data
+
+ self.addEvents(events)
+
</ins><span class="cx"> # Schedule the next poll
</span><span class="cx">
</span><span class="cx"> if not hasattr(self, "_clock"):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (12810 => 12811)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-05 05:30:00 UTC (rev 12810)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml        2014-03-05 05:30:22 UTC (rev 12811)
</span><span class="lines">@@ -80,6 +80,9 @@
</span><span class="cx">
</span><span class="cx"> var maxSeen = 30;
</span><span class="cx">
</span><ins>+ var eventSource = undefined;
+ var itemTypeEventListener = undefined;
+
</ins><span class="cx"> function drawChart(data) {
</span><span class="cx"> items = [];
</span><span class="cx">
</span><span class="lines">@@ -256,19 +259,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function registerForEvents() {
</span><del>- var eventSource = new EventSource("./events");
</del><ins>+ eventSource = new EventSource("./events");
</ins><span class="cx">
</span><span class="cx"> eventSource.addEventListener(
</span><span class="cx"> "work-total",
</span><del>- function(e) { drawChart(JSON.parse(e.data)); },
</del><ins>+ function(e) {
+ // container = document.getElementById("event_debug");
+ // container.innerHTML = e.data;
+
+ drawChart(JSON.parse(e.data));
+ },
</ins><span class="cx"> false
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function showDetails(workItemType) {
</span><del>- container = document.getElementById("work_item_details");
</del><ins>+ detailsContainer = document.getElementById("work_item_details");
+ detailsContainer.innerHTML = workItemType;
</ins><span class="cx">
</span><del>- container.innerHTML = workItemType;
</del><ins>+ if (itemTypeEventListener != undefined) {
+ eventSource.removeEventListener(itemTypeEventListener)
+ }
+
+ eventContainer = document.getElementById("event_debug");
+ eventContainer.innerHTML = "";
+
+ itemTypeEventListener = function(e) {
+ eventContainer.innerHTML = e.data;
+ }
+
+ eventSource.addEventListener(workItemType, itemTypeEventListener)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.onload = function() {
</span><span class="lines">@@ -289,6 +309,8 @@
</span><span class="cx">
</span><span class="cx"> <div id="work_item_details" />
</span><span class="cx">
</span><ins>+ <div id="event_debug" />
+
</ins><span class="cx"> </body>
</span><span class="cx">
</span><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>