[CalendarServer-changes] [15635] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 15635
          http://trac.calendarserver.org//changeset/15635
Author:   cdaboo at apple.com
Date:     2016-05-23 12:51:21 -0700 (Mon, 23 May 2016)
Log Message:
-----------
Make sure the default config is loaded and updated early on to avoid race conditions during startup.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/__init__.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/twistedcaldav/__init__.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/__init__.py	2016-05-23 19:37:47 UTC (rev 15634)
+++ CalendarServer/trunk/twistedcaldav/__init__.py	2016-05-23 19:51:21 UTC (rev 15635)
@@ -33,6 +33,9 @@
 # Register additional WebDAV XML elements
 #
 
+from twistedcaldav.config import config
+config.update()
+
 import twistedcaldav.caldavxml
 import twistedcaldav.carddavxml
 import twistedcaldav.mkcolxml

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-05-23 19:37:47 UTC (rev 15634)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2016-05-23 19:51:21 UTC (rev 15635)
@@ -1839,6 +1839,7 @@
 config.setProvider(PListConfigProvider(DEFAULT_CONFIG))
 config.addPreUpdateHooks(PRE_UPDATE_HOOKS)
 config.addPostUpdateHooks(POST_UPDATE_HOOKS)
+config.update()
 
 
 def _preserveConfig(configDict):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20160523/856f3241/attachment.html>