Revision: 15481 http://trac.calendarserver.org//changeset/15481 Author: dre@apple.com Date: 2016-03-22 14:40:24 -0700 (Tue, 22 Mar 2016) Log Message: ----------- Don't try to load APNS certificates for disabled services. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/stdconfig.py Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py =================================================================== --- CalendarServer/trunk/twistedcaldav/stdconfig.py 2016-03-22 16:44:04 UTC (rev 15480) +++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2016-03-22 21:40:24 UTC (rev 15481) @@ -1679,15 +1679,16 @@ else: continue - if not service[protocol]["Topic"]: - try: - getAPNTopicFromConfig(protocol, accountName, service[protocol]) - except ValueError as e: - log.error(e) + if service[protocol].Enabled: + if not service[protocol]["Topic"]: + try: + getAPNTopicFromConfig(protocol, accountName, service[protocol]) + except ValueError as e: + log.error(e) - # If we already have the cert passphrase, don't fetch it again - if not service[protocol]["Passphrase"]: - log.info("{p} APNS certificate passphrase not found in keychain", p=protocol) + # If we already have the cert passphrase, don't fetch it again + if not service[protocol]["Passphrase"]: + log.info("{p} APNS certificate passphrase not found in keychain", p=protocol)