Use get_running_loop() instead of str cmp to check for a running event loop

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

src/frequenz/sdk/_internal/_asyncio.py

@@ -6,6 +6,7 @@
 
 import asyncio
 import logging
+import sys
 from abc import ABC
 from datetime import timedelta
 from typing import Any, Callable, Coroutine
@@ -32,6 +33,15 @@ async def cancel_and_await(task: asyncio.Task[Any]) -> None:
         pass
 
 
+def is_loop_running() -> bool:
+    """Check if the event loop is running."""
+    try:
+        asyncio.get_running_loop()
+        return True
+    except RuntimeError:
+        return False
+
+
 async def run_forever(
     async_callable: Callable[[], Coroutine[Any, Any, None]],
     interval: timedelta = timedelta(seconds=1),
@@ -46,20 +56,10 @@ async def run_forever(
     while True:
         try:
             await async_callable()
-        except RuntimeError as exc:
-            if "no running event loop" in str(exc):
-                _logger.exception(
-                    "Something went wrong, no running event loop, skipping execution of %s",
-                    async_callable.__name__,
-                )
-                return
         except Exception:  # pylint: disable=broad-except
-            if not asyncio.get_event_loop().is_running():
-                _logger.exception(
-                    "Something went wrong, no running event loop, skipping execution of %s",
-                    async_callable.__name__,
-                )
-                return
+            if not is_loop_running():
+                _logger.exception("There is no running event loop, aborting...")
+                sys.exit(-1)
             _logger.exception("Restarting after exception")
         await asyncio.sleep(interval_s)
 

src/frequenz/sdk/actor/_actor.py

@@ -8,6 +8,7 @@
 import logging
 from datetime import timedelta
 
+from .._internal._asyncio import is_loop_running
 from ._background_service import BackgroundService
 
 _logger = logging.getLogger(__name__)
@@ -104,16 +105,15 @@ async def _run_loop(self) -> None:
             except asyncio.CancelledError:
                 _logger.info("Actor %s: Cancelled.", self)
                 raise
-            except Exception as exc:  # pylint: disable=broad-except
-                if isinstance(exc, RuntimeError) and "no running event loop" in str(
-                    exc
-                ):
+            except Exception:  # pylint: disable=broad-except
+                if not is_loop_running():
                     _logger.exception(
                         "Something went wrong, no running event loop,"
                         " not trying to restart %s again.",
                         self,
                     )
-                    break
+                    raise
+
                 if self._is_cancelled:
                     # If actor was cancelled, but any tasks have failed with an exception
                     # other than asyncio.CancelledError, those exceptions are combined