[CalendarServer-changes] [4734] CalendarServer/branches/users/wsanchez/deployment/twistedcaldav

source_changes at macosforge.org source_changes at macosforge.org
Tue Nov 10 13:02:50 PST 2009


Revision: 4734
          http://trac.macosforge.org/projects/calendarserver/changeset/4734
Author:   sagen at apple.com
Date:     2009-11-10 13:02:48 -0800 (Tue, 10 Nov 2009)
Log Message:
-----------
Handle service locators properly

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py
    CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py	2009-11-10 19:52:59 UTC (rev 4733)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/cluster.py	2009-11-10 21:02:48 UTC (rev 4734)
@@ -237,7 +237,7 @@
 
     # Refresh directory information on behalf of the child processes
     directoryClass = namedClass(config.DirectoryService["type"])
-    directory = directoryClass(dosetup=False, **config.DirectoryService["params"])
+    directory = directoryClass(dosetup=True, doreload=False, **config.DirectoryService["params"])
     directory.refresh()
 
     s = service.MultiService()

Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/directory/appleopendirectory.py	2009-11-10 19:52:59 UTC (rev 4733)
+++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/directory/appleopendirectory.py	2009-11-10 21:02:48 UTC (rev 4734)
@@ -68,7 +68,7 @@
     def __repr__(self):
         return "<%s %r: %r>" % (self.__class__.__name__, self.realmName, self.node)
 
-    def __init__(self, node="/Search", requireComputerRecord=True, dosetup=True, cacheTimeout=30, **kwds):
+    def __init__(self, node="/Search", requireComputerRecord=True, dosetup=True, doreload=True, cacheTimeout=30, **kwds):
         """
         @param node: an OpenDirectory node name to bind to.
         @param requireComputerRecord: C{True} if the directory schema is to be used to determine
@@ -111,8 +111,9 @@
                     if self.isWorkgroupServer:
                         self.log_info("Enabling Workgroup Server compatibility mode")
 
-            for recordType in self.recordTypes():
-                self.recordsForType(recordType)
+            if doreload:
+                for recordType in self.recordTypes():
+                    self.recordsForType(recordType)
 
     def refresh(self, loop=True):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091110/f0fc4861/attachment.html>


More information about the calendarserver-changes mailing list