<!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>[15630] 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/15630">15630</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-05-21 09:37:22 -0700 (Sat, 21 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix work queue webadmin page.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadmineventsourcepy">CalendarServer/trunk/calendarserver/webadmin/eventsource.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminlandingpy">CalendarServer/trunk/calendarserver/webadmin/landing.py</a></li>
<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="CalendarServertrunkcalendarserverwebadmineventsourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/eventsource.py (15629 => 15630)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2016-05-21 13:30:05 UTC (rev 15629)
+++ CalendarServer/trunk/calendarserver/webadmin/eventsource.py 2016-05-21 16:37:22 UTC (rev 15630)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> self._streams.remove(response.stream)
</span><span class="cx"> return _response
</span><span class="cx">
</span><del>- request.addResponseFilter(cleanupFilter)
</del><ins>+ #request.addResponseFilter(cleanupFilter)
</ins><span class="cx"> self._streams.add(response.stream)
</span><span class="cx">
</span><span class="cx"> return response
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> def didAddEvents(self):
</span><span class="cx"> d = self._deferredRead
</span><span class="cx"> if d is not None:
</span><del>- d.addCallback(lambda _: self.read())
</del><ins>+ self._deferredRead = None
</ins><span class="cx"> d.callback(None)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -264,6 +264,7 @@
</span><span class="cx">
</span><span class="cx"> d = Deferred()
</span><span class="cx"> self._deferredRead = d
</span><ins>+ d.addCallback(lambda _: self.read())
</ins><span class="cx"> return d
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlandingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py (15629 => 15630)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/landing.py 2016-05-21 13:30:05 UTC (rev 15629)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py 2016-05-21 16:37:22 UTC (rev 15630)
</span><span class="lines">@@ -71,11 +71,11 @@
</span><span class="cx"> from .principals import PrincipalsResource
</span><span class="cx"> self.putChild(u"principals", PrincipalsResource(directory, store, principalCollections))
</span><span class="cx">
</span><del>- # from .logs import LogsResource
- # self.putChild(u"logs", LogsResource(principalCollections))
</del><ins>+ from .logs import LogsResource
+ self.putChild(u"logs", LogsResource(principalCollections))
</ins><span class="cx">
</span><del>- # from .work import WorkMonitorResource
- # self.putChild(u"work", WorkMonitorResource(store))
</del><ins>+ from .work import WorkMonitorResource
+ self.putChild(u"work", WorkMonitorResource(store, principalCollections))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # def getChild(self, name):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.py (15629 => 15630)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.py 2016-05-21 13:30:05 UTC (rev 15629)
+++ CalendarServer/trunk/calendarserver/webadmin/work.py 2016-05-21 16:37:22 UTC (rev 15630)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> from zope.interface import implementer
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><ins>+from twisted.python.failure import Failure
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.enterprise.jobs.jobitem import JobItem
</span><span class="lines">@@ -110,7 +111,7 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def poll(self):
</span><span class="cx"> if self._polling:
</span><del>- return
</del><ins>+ returnValue(None)
</ins><span class="cx">
</span><span class="cx"> self._polling = True
</span><span class="cx">
</span><span class="lines">@@ -152,10 +153,10 @@
</span><span class="cx">
</span><span class="cx"> work = yield job.workItem()
</span><span class="cx">
</span><del>- attrs = ("workID", "group")
</del><ins>+ attrs = ("workID",)
</ins><span class="cx">
</span><span class="cx"> if workType == PushNotificationWork:
</span><del>- attrs += ("pushID", "priority")
</del><ins>+ attrs += ("pushID", "pushPriority")
</ins><span class="cx"> elif workType == ScheduleOrganizerWork:
</span><span class="cx"> attrs += ("icalendarUID", "attendeeCount")
</span><span class="cx"> elif workType == ScheduleRefreshWork:
</span><span class="lines">@@ -212,11 +213,13 @@
</span><span class="cx">
</span><span class="cx"> self.addEvents(events)
</span><span class="cx">
</span><del>- except:
</del><ins>+ except Exception:
+ f = Failure()
</ins><span class="cx"> self._polling = False
</span><span class="cx"> yield txn.abort()
</span><del>- raise
</del><ins>+ returnValue(f)
</ins><span class="cx"> else:
</span><ins>+ self._polling = False
</ins><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx"> # Schedule the next poll
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminworkxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml (15629 => 15630)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2016-05-21 13:30:05 UTC (rev 15629)
+++ CalendarServer/trunk/calendarserver/webadmin/work.xhtml 2016-05-21 16:37:22 UTC (rev 15630)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx">
</span><del>- <script src="http://d3js.org/d3.v3.min.js"></script>
</del><ins>+ <script src="https://d3js.org/d3.v3.min.js"></script>
</ins><span class="cx"> <script>
</span><span class="cx"> //<![CDATA[
</span><span class="cx">
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> var eventSource;
</span><span class="cx">
</span><span class="cx"> function registerForEvents() {
</span><del>- eventSource = new EventSource("./events");
</del><ins>+ eventSource = new EventSource("/webadmin/work/events");
</ins><span class="cx">
</span><span class="cx"> eventSource.addEventListener(
</span><span class="cx"> "work-total",
</span></span></pre>
</div>
</div>
</body>
</html>