r5406 - in trunk: cumin/python/cumin sage/python/sage/wallaby

tmckay at fedoraproject.org tmckay at fedoraproject.org
Wed Jun 6 19:36:08 UTC 2012


Author: tmckay
Date: 2012-06-06 19:36:08 +0000 (Wed, 06 Jun 2012)
New Revision: 5406

Modified:
   trunk/cumin/python/cumin/main.py
   trunk/sage/python/sage/wallaby/wallabyoperations.py
Log:
Tweak shutdown for the wallaby thread.


Modified: trunk/cumin/python/cumin/main.py
===================================================================
--- trunk/cumin/python/cumin/main.py	2012-06-06 19:18:53 UTC (rev 5405)
+++ trunk/cumin/python/cumin/main.py	2012-06-06 19:36:08 UTC (rev 5406)
@@ -272,7 +272,7 @@
         log.info("Stopping %s", self)
 
         if self.wallaby is not None:
-            self.wallaby.stop()
+            self.wallaby.stop(wait=True)
 
         self.server.stop()
         try:

Modified: trunk/sage/python/sage/wallaby/wallabyoperations.py
===================================================================
--- trunk/sage/python/sage/wallaby/wallabyoperations.py	2012-06-06 19:18:53 UTC (rev 5405)
+++ trunk/sage/python/sage/wallaby/wallabyoperations.py	2012-06-06 19:36:08 UTC (rev 5406)
@@ -286,7 +286,7 @@
                 self._stop = True
                 self._condition.notify()
                 self._condition.release()
-                if wait:
+                if wait and self._maintain_cache.isAlive():
                     self._maintain_cache.join(timeout)
                 log.debug("WallabyOperations: stopped cache maintenance thread")
 



More information about the cumin-developers mailing list