[CalendarServer-changes] [14312] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14312
          http://trac.calendarserver.org//changeset/14312
Author:   sagen at apple.com
Date:     2015-01-15 12:06:41 -0800 (Thu, 15 Jan 2015)
Log Message:
-----------
Only have PeerConnectionPool AMP listen if specifically enabled, defaulting to off

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2015-01-15 19:48:57 UTC (rev 14311)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2015-01-15 20:06:41 UTC (rev 14312)
@@ -1250,8 +1250,14 @@
 
             # Job queues always required
             from twisted.internet import reactor
+
+            if config.WorkQueue.enableAMP:
+                ampPort = config.WorkQueue.ampPort
+            else:
+                ampPort = None
+
             pool = PeerConnectionPool(
-                reactor, store.newTransaction, config.WorkQueue.ampPort
+                reactor, store.newTransaction, ampPort
             )
             self._initJobQueue(pool)
             store.queuer = store.queuer.transferProposalCallbacks(pool)
@@ -1836,8 +1842,14 @@
                 stats.store = store
 
             from twisted.internet import reactor
+
+            if config.WorkQueue.enableAMP:
+                ampPort = config.WorkQueue.ampPort
+            else:
+                ampPort = None
+
             pool = PeerConnectionPool(
-                reactor, store.newTransaction, config.WorkQueue.ampPort
+                reactor, store.newTransaction, ampPort
             )
             self._initJobQueue(pool)
             store.queuer = store.queuer.transferProposalCallbacks(pool)

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-01-15 19:48:57 UTC (rev 14311)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-01-15 20:06:41 UTC (rev 14312)
@@ -232,6 +232,7 @@
     # Work queue configuration information
     #
     "WorkQueue": {
+        "enableAMP": False,
         "ampPort": 7654,            # Port used for hosts in a cluster to talk to each other
 
         "queuePollInterval": 0.1,   # Interval in seconds for job queue polling
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150115/a3e116f5/attachment.html>