Stop heartbeat thread in case of unhandled exceptions.

closeio · Apr 25, 2024 · e440d8f · e440d8f
1 parent 8336066
commit e440d8f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/tasktiger/executor.py b/tasktiger/executor.py
@@ -434,10 +434,13 @@ def execute(
         heartbeat_thread.start()
 
         # Run the tasks.
-        result = self.execute_tasks(tasks, log)
-
-        # Stop the heartbeat thread.
-        stop_event.set()
-        heartbeat_thread.join()
+        try:
+            result = self.execute_tasks(tasks, log)
+        # Always stop the heartbeat thread -- even in case of an unhandled
+        # exception after running the task code, or when an unhandled
+        # BaseException is raised from within the task.
+        finally:
+            stop_event.set()
+            heartbeat_thread.join()
 
         return result