[CalendarServer-changes] [1380] CalendarServer/trunk/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 1380
          http://trac.macosforge.org/projects/calendarserver/changeset/1380
Author:   cdaboo at apple.com
Date:     2007-03-14 10:18:19 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------
Only merge certain dict config parameters. Others, like DirectoryService, can't be merged because different services uses different sets
of arguments, and merging one set with another results in exception on startup.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2007-03-14 16:52:27 UTC (rev 1379)
+++ CalendarServer/trunk/twistedcaldav/config.py	2007-03-14 17:18:19 UTC (rev 1380)
@@ -64,11 +64,11 @@
     #    users, groups, locations and resources) to the server.
     #
     "DirectoryService": {
-#        "type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService",
-#        "params": {
-#            "node": "/Search",
-#            "requireComputerRecord": True,
-#        },
+        "type": "twistedcaldav.directory.appleopendirectory.OpenDirectoryService",
+        "params": {
+            "node": "/Search",
+            "requireComputerRecord": True,
+        },
     },
 
     #
@@ -148,7 +148,7 @@
 
 def _mergeData(oldData, newData):
     for key, value in newData.iteritems():
-        if isinstance(value, (dict,)):
+        if isinstance(value, (dict,)) and key in ("MultiProcess",):
             assert isinstance(oldData.get(key, {}), (dict,))
             oldData[key] = _mergeData(oldData.get(key, {}), value)
         else:

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070314/877cd1d0/attachment.html