[CalendarServer-changes] [12358] CalendarServer/branches/release/CalendarServer-5.2-dev/ calendarserver/tools

[source_changes at macosforge.org]

Revision: 12358
          http://trac.calendarserver.org//changeset/12358
Author:   cdaboo at apple.com
Date:     2014-01-16 08:52:43 -0800 (Thu, 16 Jan 2014)
Log Message:
-----------
Slight improvements to worker service behavior.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py
    CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py
    CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py
    CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py	2014-01-16 15:36:02 UTC (rev 12357)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/cmdline.py	2014-01-16 16:52:43 UTC (rev 12358)
@@ -179,5 +179,8 @@
         By default, stop the reactor after doWork( ) finishes.  Subclasses
         can override this if they want different behavior.
         """
-        from twisted.internet import reactor
-        reactor.stop()
+        if hasattr(self, "reactor"):
+            self.reactor.stop()
+        else:
+            from twisted.internet import reactor
+            reactor.stop()

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py	2014-01-16 15:36:02 UTC (rev 12357)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/export.py	2014-01-16 16:52:43 UTC (rev 12358)
@@ -298,13 +298,6 @@
         self._directory = self.store.directoryService()
 
 
-    def postStartService(self):
-        """
-        Don't quit right away
-        """
-        pass
-
-
     @inlineCallbacks
     def doWork(self):
         """
@@ -325,9 +318,7 @@
         except:
             log.failure("doWork()")
 
-        self.reactor.stop()
 
-
     def directoryService(self):
         """
         Get an appropriate directory service.

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py	2014-01-16 15:36:02 UTC (rev 12357)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/migrate_verify.py	2014-01-16 16:52:43 UTC (rev 12358)
@@ -139,13 +139,6 @@
         self.missingResources = []
 
 
-    def postStartService(self):
-        """
-        Don't quit right away
-        """
-        pass
-
-
     @inlineCallbacks
     def doWork(self):
         """
@@ -162,9 +155,7 @@
         except:
             log.failure("doWork()")
 
-        self.reactor.stop()
 
-
     def readPaths(self):
 
         self.output.write("-- Reading data file: %s\n" % (self.options["data"]))

Modified: CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py	2014-01-16 15:36:02 UTC (rev 12357)
+++ CalendarServer/branches/release/CalendarServer-5.2-dev/calendarserver/tools/obliterate.py	2014-01-16 16:52:43 UTC (rev 12358)
@@ -157,13 +157,6 @@
         self.attachments = set()
 
 
-    def postStartService(self):
-        """
-        Don't quit right away
-        """
-        pass
-
-
     @inlineCallbacks
     def doWork(self):
         """
@@ -185,9 +178,7 @@
         except:
             log.failure("doWork()")
 
-        self.reactor.stop()
 
-
     @inlineCallbacks
     def obliterateOrphanedProperties(self):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/de384a5e/attachment.html>