[CalendarServer-changes] [4755] CalendarServer/branches/users/cdaboo/partition-4464/calendarserver/ tools/util.py

[source_changes at macosforge.org]

Revision: 4755
          http://trac.macosforge.org/projects/calendarserver/changeset/4755
Author:   cdaboo at apple.com
Date:     2009-11-17 09:47:02 -0800 (Tue, 17 Nov 2009)
Log Message:
-----------
Need augment/proxy DB classes loaded before the directory.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/partition-4464/calendarserver/tools/util.py

Modified: CalendarServer/branches/users/cdaboo/partition-4464/calendarserver/tools/util.py
===================================================================
--- CalendarServer/branches/users/cdaboo/partition-4464/calendarserver/tools/util.py	2009-11-17 17:33:00 UTC (rev 4754)
+++ CalendarServer/branches/users/cdaboo/partition-4464/calendarserver/tools/util.py	2009-11-17 17:47:02 UTC (rev 4755)
@@ -29,7 +29,7 @@
 
 import socket
 from twistedcaldav.config import config, ConfigurationError
-from twistedcaldav.directory import augment
+from twistedcaldav.directory import augment, calendaruserproxy
 from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
 from twistedcaldav.stdconfig import DEFAULT_CONFIG_FILE
 
@@ -89,14 +89,18 @@
             return self.principalCollection.principalForCalendarUserAddress(cua)
 
 
+    # Load augment/proxy db classes now
+    augmentClass = namedClass(config.AugmentService.type)
+    augment.AugmentService = augmentClass(**config.AugmentService.params)
+
+    proxydbClass = namedClass(config.ProxyDBService.type)
+    calendaruserproxy.ProxyDBService = proxydbClass(**config.ProxyDBService.params)
+
     # Wait for directory service to become available
     directory = MyDirectoryService(config.DirectoryService.params)
     while not directory.isAvailable():
         sleep(5)
 
-    augmentClass = namedClass(config.AugmentService.type)
-    augment.AugmentService = augmentClass(**config.AugmentService.params)
-
     return directory
 
 class DummyDirectoryService (DirectoryService):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091117/875ae39b/attachment.html>