浏览代码

joining of threads broke the tests

Ask Solem 15 年之前
父节点
当前提交
f2911e4a5d
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      celery/worker/heartbeat.py

+ 2 - 1
celery/worker/heartbeat.py

@@ -58,4 +58,5 @@ class Heart(threading.Thread):
         self._state = "CLOSE"
         self._shutdown.set()
         self._stopped.wait() # block until this thread is done
-        self.join(1e100)
+        if self.isAlive():
+            self.join(1e100)