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

[source_changes at macosforge.org]

Revision: 8405
          http://trac.macosforge.org/projects/calendarserver/changeset/8405
Author:   glyph at apple.com
Date:     2011-12-06 00:02:23 -0800 (Tue, 06 Dec 2011)
Log Message:
-----------
Only initialize the dispenser if configured for a shared connection pool.

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

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2011-12-06 01:04:08 UTC (rev 8404)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2011-12-06 08:02:23 UTC (rev 8405)
@@ -911,6 +911,10 @@
                 cp.setServiceParent(ms)
                 store = storeFromConfig(config, cp.connection)
                 mainService = createMainService(cp, store)
+                if config.SharedConnectionPool:
+                    dispenser = ConnectionDispenser(cp)
+                else:
+                    dispenser = None
                 if config.ParallelUpgrades:
                     parallel = config.MultiProcess.ProcessCount
                 else:
@@ -924,7 +928,7 @@
                                 PostDBImportService(config, store, mainService),
                                 store, uid=overrideUID, gid=overrideGID,
                                 spawner=ConfiguredChildSpawner(
-                                    self, ConnectionDispenser(cp), config
+                                    self, dispenser, config
                                 ),
                                 parallel=parallel
                             ),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111206/3bd92ad9/attachment.html>