[CalendarServer-changes] [5307] CalendarServer/trunk/calendarserver/tap/caldav.py

[source_changes at macosforge.org]

Revision: 5307
          http://trac.macosforge.org/projects/calendarserver/changeset/5307
Author:   sagen at apple.com
Date:     2010-03-15 11:05:21 -0700 (Mon, 15 Mar 2010)
Log Message:
-----------
When the master sets up the proxy db, it needs to set calendaruserproxy.ProxyDBService

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2010-03-15 18:00:35 UTC (rev 5306)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2010-03-15 18:05:21 UTC (rev 5307)
@@ -37,6 +37,7 @@
 
 from twisted.python.log import FileLogObserver
 from twisted.python.usage import Options, UsageError
+from twisted.python.reflect import namedClass
 from twisted.plugin import IPlugin
 from twisted.internet.reactor import callLater, spawnProcess, addSystemEventTrigger
 from twisted.internet.process import ProcessExitedAlready
@@ -63,6 +64,7 @@
 from twistedcaldav.config import ConfigurationError
 from twistedcaldav.config import config
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
+from twistedcaldav.directory import calendaruserproxy
 from twistedcaldav.directory.calendaruserproxyloader import XMLCalendarUserProxyLoader
 from twistedcaldav.localization import processLocalizationFiles
 from twistedcaldav.mail import IMIPReplyInboxResource
@@ -444,6 +446,8 @@
                 # Make sure proxies get initialized
                 if config.ProxyLoadFromFile:
                     def _doProxyUpdate():
+                        proxydbClass = namedClass(config.ProxyDBService.type)
+                        calendaruserproxy.ProxyDBService = proxydbClass(**config.ProxyDBService.params)
                         loader = XMLCalendarUserProxyLoader(config.ProxyLoadFromFile)
                         return loader.updateProxyDB()
                     addSystemEventTrigger("after", "startup", _doProxyUpdate)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100315/9f9356f9/attachment.html>