[CalendarServer-changes] [8400] CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/ tap/caldav.py

[source_changes at macosforge.org]

Revision: 8400
          http://trac.macosforge.org/projects/calendarserver/changeset/8400
Author:   glyph at apple.com
Date:     2011-12-03 00:40:33 -0800 (Sat, 03 Dec 2011)
Log Message:
-----------
honor the option as specified

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/caldav.py

Modified: CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/caldav.py	2011-12-03 08:40:24 UTC (rev 8399)
+++ CalendarServer/branches/users/glyph/parallel-upgrade/calendarserver/tap/caldav.py	2011-12-03 08:40:33 UTC (rev 8400)
@@ -911,6 +911,10 @@
                 cp.setServiceParent(ms)
                 store = storeFromConfig(config, cp.connection)
                 mainService = createMainService(cp, store)
+                if config.ParallelUpgrades:
+                    parallel = config.MultiProcess.ProcessCount
+                else:
+                    parallel = 0
                 upgradeSvc = UpgradeFileSystemFormatService(
                     config,
                     UpgradeDatabaseSchemaService.wrapService(
@@ -922,7 +926,7 @@
                                 spawner=ConfiguredChildSpawner(
                                     self, ConnectionDispenser(cp), config
                                 ),
-                                parallel=config.MultiProcess.ProcessCount
+                                parallel=parallel
                             ),
                             store, uid=overrideUID, gid=overrideGID,
                         ),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111203/dac10878/attachment.html>