From 68d74347c6712701b3ad327d68de46f0e91e08af Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Fri, 2 Jun 2023 14:03:11 +0200 Subject: [PATCH] silently catches error in systemd.daemon.notify our version of systemd installed does not accept a string as argument for systemd.daemon.notify anyway, whether systemd notifications are sent or not should not depend only on the presence of a package, but should be configurable. Change-Id: I466d1ed2b969301a287dd532ab4d0743a74045fa Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31280 Tested-by: Jenkins Automated Tests Reviewed-by: Enrico Faulhaber Reviewed-by: Markus Zolliker --- frappy/server.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappy/server.py b/frappy/server.py index f0cfb80e..e846da04 100644 --- a/frappy/server.py +++ b/frappy/server.py @@ -45,6 +45,7 @@ except ImportError: DaemonContext = None try: + # pylint: disable=unused-import import systemd.daemon except ImportError: systemd = None @@ -132,8 +133,12 @@ class Server: while self._restart: self._restart = False try: - if systemd: + # TODO: make systemd notifications configurable + if systemd: # pylint: disable=used-before-assignment systemd.daemon.notify("STATUS=initializing") + except Exception: + systemd = None # pylint: disable=redefined-outer-name + try: self._processCfg() if self._testonly: return