[CalendarServer-changes] [6842] CalendarServer/branches/users/glyph/db-reconnect/calendarserver/tap/ caldav.py

[source_changes at macosforge.org]

Revision: 6842
          http://trac.macosforge.org/projects/calendarserver/changeset/6842
Author:   glyph at apple.com
Date:     2011-02-01 16:08:51 -0800 (Tue, 01 Feb 2011)
Log Message:
-----------
Actually wait for subprocesses to exit before exiting the master.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/db-reconnect/calendarserver/tap/caldav.py

Modified: CalendarServer/branches/users/glyph/db-reconnect/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/db-reconnect/calendarserver/tap/caldav.py	2011-02-02 00:08:44 UTC (rev 6841)
+++ CalendarServer/branches/users/glyph/db-reconnect/calendarserver/tap/caldav.py	2011-02-02 00:08:51 UTC (rev 6842)
@@ -39,7 +39,7 @@
 from twisted.python.usage import Options, UsageError
 from twisted.python.reflect import namedClass
 from twisted.plugin import IPlugin
-from twisted.internet.defer import gatherResults
+from twisted.internet.defer import gatherResults, Deferred
 from twisted.internet import reactor as _reactor
 from twisted.internet.reactor import addSystemEventTrigger
 from twisted.internet.process import ProcessExitedAlready
@@ -1428,6 +1428,8 @@
         """
         self.stopping = True
         self.deferreds = {}
+        for name in self.processes:
+            self.deferreds[name] = Deferred()
         super(DelayedStartupProcessMonitor, self).stopService()
 
         # Cancel any outstanding restarts
@@ -1503,7 +1505,7 @@
                                                          self.startProcess,
                                                          name)
         if self.stopping:
-            deferred = self.deferreds.get(name, None)
+            deferred = self.deferreds.pop(name, None)
             if deferred is not None:
                 deferred.callback(None)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110201/a8d4a94a/attachment.html>