From 2940ba0d35336c2681afe2606c1458c057210443 Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 24 Nov 2022 12:25:04 +0100 Subject: [PATCH] core (main): log Exception when `bridge_pi` fails --- sat/core/sat_main.py | 14 ++++++++++---- tests/unit/conftest.py | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sat/core/sat_main.py b/sat/core/sat_main.py index 5801f468..19d12663 100644 --- a/sat/core/sat_main.py +++ b/sat/core/sat_main.py @@ -95,10 +95,10 @@ class SAT(service.Service): try: self.bridge = bridge_module.Bridge() except exceptions.BridgeInitError: - log.error("Bridge can't be initialised, can't start Libervia Backend") + log.exception("Bridge can't be initialised, can't start Libervia Backend") sys.exit(1) - defer.ensureDeferred(self._postInit()) + defer.ensureDeferred(self._post_init()) @property def version(self): @@ -128,13 +128,19 @@ class SAT(service.Service): def bridge_name(self): return os.path.splitext(os.path.basename(self.bridge.__file__))[0] - async def _postInit(self): + async def _post_init(self): try: bridge_pi = self.bridge.postInit except AttributeError: pass else: - await bridge_pi() + try: + await bridge_pi() + except Exception: + log.exception("Could not initialize bridge") + # because init is not complete at this stage, we use callLater + reactor.callLater(0, self.stop) + return self.bridge.register_method("getReady", lambda: self.initialised) self.bridge.register_method("getVersion", lambda: self.full_version) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 23ab3e70..45581ac8 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -60,7 +60,7 @@ class MockSAT(SAT): self.trigger = trigger.TriggerManager() self.bridge = bridge - defer.ensureDeferred(self._postInit()) + defer.ensureDeferred(self._post_init()) self.common_cache = AsyncMock() self._import_plugins() self._addBaseMenus() @@ -98,7 +98,7 @@ class MockSAT(SAT): def _init(self): pass - async def _postInit(self): + async def _post_init(self): pass