await canceled tasks

blacklanternsecurity · Sep 17, 2024 · 3f6051a · 3f6051a
1 parent 3a8636c
commit 3f6051a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/bbot/core/engine.py b/bbot/core/engine.py
@@ -643,6 +643,7 @@ async def finished_tasks(self, tasks, timeout=None):
                     self.log.warning(f"{self.name}: Timeout after {timeout:,} seconds in finished_tasks({tasks})")
                     for task in tasks:
                         task.cancel()
+                        self._await_cancelled_task(task)
                 else:
                     if not in_exception_chain(e, (KeyboardInterrupt, asyncio.CancelledError)):
                         self.log.error(f"{self.name}: Unhandled exception in finished_tasks({tasks}): {e}")
@@ -664,7 +665,7 @@ async def cancel_task(self, client_id):
                 child_task.cancel()
 
         for task in [parent_task] + list(child_tasks):
-            await self._cancel_task(task)
+            await self._await_cancelled_task(task)
 
     async def _await_cancelled_task(self, task):
         try:
@@ -683,4 +684,4 @@ async def cancel_all_tasks(self):
             await self.cancel_task(client_id)
         for client_id, tasks in self.child_tasks.items():
             for task in tasks:
-                await self._cancel_task(task)
+                await self._await_cancelled_task(task)