[CalendarServer-changes] [15630] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 15630
          http://trac.calendarserver.org//changeset/15630
Author:   cdaboo at apple.com
Date:     2016-05-21 09:37:22 -0700 (Sat, 21 May 2016)
Log Message:
-----------
Fix work queue webadmin page.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/eventsource.py
    CalendarServer/trunk/calendarserver/webadmin/landing.py
    CalendarServer/trunk/calendarserver/webadmin/work.py
    CalendarServer/trunk/calendarserver/webadmin/work.xhtml

Modified: CalendarServer/trunk/calendarserver/webadmin/eventsource.py
===================================================================
--- 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)
@@ -172,7 +172,7 @@
             self._streams.remove(response.stream)
             return _response
 
-        request.addResponseFilter(cleanupFilter)
+        #request.addResponseFilter(cleanupFilter)
         self._streams.add(response.stream)
 
         return response
@@ -213,7 +213,7 @@
     def didAddEvents(self):
         d = self._deferredRead
         if d is not None:
-            d.addCallback(lambda _: self.read())
+            self._deferredRead = None
             d.callback(None)
 
 
@@ -264,6 +264,7 @@
 
         d = Deferred()
         self._deferredRead = d
+        d.addCallback(lambda _: self.read())
         return d
 
 

Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py
===================================================================
--- 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)
@@ -71,11 +71,11 @@
         from .principals import PrincipalsResource
         self.putChild(u"principals", PrincipalsResource(directory, store, principalCollections))
 
-        # from .logs import LogsResource
-        # self.putChild(u"logs", LogsResource(principalCollections))
+        from .logs import LogsResource
+        self.putChild(u"logs", LogsResource(principalCollections))
 
-        # from .work import WorkMonitorResource
-        # self.putChild(u"work", WorkMonitorResource(store))
+        from .work import WorkMonitorResource
+        self.putChild(u"work", WorkMonitorResource(store, principalCollections))
 
 
     # def getChild(self, name):

Modified: CalendarServer/trunk/calendarserver/webadmin/work.py
===================================================================
--- 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)
@@ -31,6 +31,7 @@
 from zope.interface import implementer
 
 from twisted.internet.defer import inlineCallbacks, returnValue
+from twisted.python.failure import Failure
 
 from twext.python.log import Logger
 from twext.enterprise.jobs.jobitem import JobItem
@@ -110,7 +111,7 @@
     @inlineCallbacks
     def poll(self):
         if self._polling:
-            return
+            returnValue(None)
 
         self._polling = True
 
@@ -152,10 +153,10 @@
 
                     work = yield job.workItem()
 
-                    attrs = ("workID", "group")
+                    attrs = ("workID",)
 
                     if workType == PushNotificationWork:
-                        attrs += ("pushID", "priority")
+                        attrs += ("pushID", "pushPriority")
                     elif workType == ScheduleOrganizerWork:
                         attrs += ("icalendarUID", "attendeeCount")
                     elif workType == ScheduleRefreshWork:
@@ -212,11 +213,13 @@
 
             self.addEvents(events)
 
-        except:
+        except Exception:
+            f = Failure()
             self._polling = False
             yield txn.abort()
-            raise
+            returnValue(f)
         else:
+            self._polling = False
             yield txn.commit()
 
         # Schedule the next poll

Modified: CalendarServer/trunk/calendarserver/webadmin/work.xhtml
===================================================================
--- 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)
@@ -53,7 +53,7 @@
 
     </style>
 
-    <script src="http://d3js.org/d3.v3.min.js"></script>
+    <script src="https://d3js.org/d3.v3.min.js"></script>
     <script>
     //<![CDATA[
 
@@ -316,7 +316,7 @@
       var eventSource;
 
       function registerForEvents() {
-        eventSource = new EventSource("./events");
+        eventSource = new EventSource("/webadmin/work/events");
 
         eventSource.addEventListener(
           "work-total",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160521/07185a71/attachment.html>