[CalendarServer-changes] [15370] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15370
          http://trac.calendarserver.org//changeset/15370
Author:   sagen at apple.com
Date:     2015-12-04 16:03:23 -0800 (Fri, 04 Dec 2015)
Log Message:
-----------
Only fire up APNS provider+feedback services for the protocols that are actually enabled

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/push/applepush.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/calendarserver/push/applepush.py
===================================================================
--- CalendarServer/trunk/calendarserver/push/applepush.py	2015-12-04 20:03:08 UTC (rev 15369)
+++ CalendarServer/trunk/calendarserver/push/applepush.py	2015-12-05 00:03:23 UTC (rev 15370)
@@ -108,7 +108,7 @@
 
         for protocol in ("CalDAV", "CardDAV"):
 
-            if settings[protocol]["CertificatePath"]:
+            if settings[protocol].Enabled:
 
                 providerTestConnector = None
                 feedbackTestConnector = None

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-12-04 20:03:08 UTC (rev 15369)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-12-05 00:03:23 UTC (rev 15370)
@@ -853,6 +853,7 @@
                 "EnableStaggering" : False,
                 "StaggerSeconds" : 3,
                 "CalDAV" : {
+                    "Enabled" : False,
                     "CertificatePath" : "Certificates/apns:com.apple.calendar.cert.pem",
                     "PrivateKeyPath" : "Certificates/apns:com.apple.calendar.key.pem",
                     "AuthorityChainPath" : "Certificates/apns:com.apple.calendar.chain.pem",
@@ -861,6 +862,7 @@
                     "Topic" : "",
                 },
                 "CardDAV" : {
+                    "Enabled" : False,
                     "CertificatePath" : "Certificates/apns:com.apple.contact.cert.pem",
                     "PrivateKeyPath" : "Certificates/apns:com.apple.contact.key.pem",
                     "AuthorityChainPath" : "Certificates/apns:com.apple.contact.chain.pem",
@@ -1688,6 +1690,14 @@
                 ("CalDAV", "apns:com.apple.calendar"),
                 ("CardDAV", "apns:com.apple.contact"),
             ):
+
+                # Set protocol-specific Enabled key only if that protocol's
+                # service is actually enabled
+                if configDict["Enable{}".format(protocol)]:
+                    service[protocol].Enabled = True
+                else:
+                    continue
+
                 if not service[protocol]["Topic"]:
                     certPath = service[protocol]["CertificatePath"]
                     if certPath:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151204/b9035ccd/attachment-0001.html>