[CalendarServer-changes] [13175] CalendarServer/branches/release/CalendarServer-5.2-dev/ calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 13175
          http://trac.calendarserver.org//changeset/13175
Author:   dre at apple.com
Date:     2014-04-05 12:11:46 -0700 (Sat, 05 Apr 2014)
Log Message:
-----------
Oops, the orphan reaper adjustment goes on the service spawner, not the slave

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py	2014-04-05 17:50:04 UTC (rev 13174)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tap/caldav.py	2014-04-05 19:11:46 UTC (rev 13175)
@@ -904,12 +904,6 @@
         else:
             groupCacher = None
 
-        # Adjust PeerConnectionPool's queueProcessTimeout, which governs the
-        # delay before an expired job is deemed orphaned and reassigned.
-        # The default in twext is 10 minutes, which is a bit long.
-        if config.WorkQueue.queueProcessTimeout:
-            pool.queueProcessTimeout = config.WorkQueue.queueProcessTimeout
-
         def decorateTransaction(txn):
             txn._pushDistributor = pushDistributor
             txn._rootResource = result.rootResource
@@ -1735,6 +1729,12 @@
             else:
                 groupCacher = None
 
+            # Adjust PeerConnectionPool's queueProcessTimeout, which governs the
+            # delay before an expired job is deemed orphaned and reassigned.
+            # The default in twext is 10 minutes, which is a bit long.
+            if config.WorkQueue.queueProcessTimeout:
+                pool.queueProcessTimeout = config.WorkQueue.queueProcessTimeout
+
             def decorateTransaction(txn):
                 txn._pushDistributor = None
                 txn._rootResource = rootResource
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140405/928aedd4/attachment.html>