[CalendarServer-changes] [14342] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14342
          http://trac.calendarserver.org//changeset/14342
Author:   cdaboo at apple.com
Date:     2015-01-24 09:52:19 -0800 (Sat, 24 Jan 2015)
Log Message:
-----------
Make dashboard work with NonPerformingQueuer.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/dashboard_service.py
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/txdav/common/datastore/test/util.py

Modified: CalendarServer/trunk/calendarserver/dashboard_service.py
===================================================================
--- CalendarServer/trunk/calendarserver/dashboard_service.py	2015-01-24 17:29:59 UTC (rev 14341)
+++ CalendarServer/trunk/calendarserver/dashboard_service.py	2015-01-24 17:52:19 UTC (rev 14342)
@@ -151,9 +151,9 @@
         """
 
         if self.factory.store:
-            queuer = self.factory.store.queuer
-            loads = queuer.workerPool.eachWorkerLoad()
-            level = queuer.workerPool.loadLevel()
+            pool = self.factory.store.pool
+            loads = pool.workerPool.eachWorkerLoad()
+            level = pool.workerPool.loadLevel()
         else:
             loads = []
             level = 0

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2015-01-24 17:29:59 UTC (rev 14341)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2015-01-24 17:52:19 UTC (rev 14342)
@@ -1262,6 +1262,7 @@
             )
             self._initJobQueue(pool)
             store.queuer = store.queuer.transferProposalCallbacks(pool)
+            store.pool = pool
             pool.setServiceParent(result)
 
             # Optionally set up mail retrieval
@@ -1856,6 +1857,7 @@
 
             # The master should not perform queued work
             store.queuer = NonPerformingQueuer()
+            store.pool = pool
 
             controlSocket.addFactory(
                 _QUEUE_ROUTE, pool.workerListenerFactory()

Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/util.py	2015-01-24 17:29:59 UTC (rev 14341)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py	2015-01-24 17:52:19 UTC (rev 14342)
@@ -262,6 +262,7 @@
                 reactor, store.newTransaction, None, useWorkerPool=False
             )
             store.queuer = store.queuer.transferProposalCallbacks(pool)
+            store.pool = pool
             pool.startService()
 
         returnValue(store)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150124/5b0256d8/attachment-0001.html>