Wrap shutdown_units().result() and context.revert().result() with while True: try...except KeyboardInterrupt — the same pattern already used for the stop barrier. This ensures SIGINT can't skip context.revert(), which is what cancels the pub/sub internal tasks.

Author: cboulay

src/ezmsg/core/backendprocess.py

@@ -309,12 +309,24 @@ async def shutdown_units() -> None:
                     else:
                         unit.shutdown()  # type: ignore
 
-            asyncio.run_coroutine_threadsafe(shutdown_units(), loop=loop).result()
+            shutdown_future = asyncio.run_coroutine_threadsafe(shutdown_units(), loop=loop)
+            while True:
+                try:
+                    shutdown_future.result()
+                    break
+                except KeyboardInterrupt:
+                    ...
 
             # for cache in MessageCache.values():
             #     cache.clear()
 
-            asyncio.run_coroutine_threadsafe(context.revert(), loop=loop).result()
+            revert_future = asyncio.run_coroutine_threadsafe(context.revert(), loop=loop)
+            while True:
+                try:
+                    revert_future.result()
+                    break
+                except KeyboardInterrupt:
+                    ...
 
             logger.debug(f"Remaining tasks in event loop = {asyncio.all_tasks(loop)}")