Optimize local logging.

tum-esm · Oct 14, 2024 · 64a03d9 · 64a03d9
1 parent 531fd47
commit 64a03d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/edge-node/src/main.py b/edge-node/src/main.py
@@ -93,23 +93,26 @@ def run() -> None:
     def _graceful_teardown(*_args: Any) -> None:
         utils.set_alarm(10, "graceful teardown")
 
-        logger.info("Starting graceful teardown.")
+        logger.info("Start: Graceful teardown.")
         try:
+            logger.info("Start: Hardware teardown.")
             hardware_interface.teardown()
+            logger.info("Stop: Hardware teardown.")
         except Exception as e:
             logger.exception(e,
                              label="Issue while hardware interface teardown.",
                              config=config)
 
         try:
+            logger.info("Start: MQTT Agent deinit.")
             procedures.MQTTAgent.deinit()
+            logger.info("Stop: MQTT Agent deinit.")
         except Exception as e:
             logger.exception(e,
                              label="Issue while MQTT Agent deinit.",
                              config=config)
 
-        logger.info("Finished graceful teardown.")
-        logger.info("Performing clean program exit.")
+        logger.info("Stop: Graceful teardown.")
 
     signal.signal(signal.SIGINT, _graceful_teardown)
     signal.signal(signal.SIGTERM, _graceful_teardown)

diff --git a/edge-node/src/procedures/mqtt_agent.py b/edge-node/src/procedures/mqtt_agent.py
@@ -99,9 +99,12 @@ def _enqueue_heartbeat_message() -> None:
         def _graceful_teardown(*_args: Any) -> None:
             utils.set_alarm(10, "graceful teardown")
 
-            logger.info("starting MQTT agent graceful shutdown")
-            mqtt_connection.teardown()
-            logger.info("finished MQTT agent graceful shutdown")
+            logger.info("Start: Disconnect MQTT client.")
+            try:
+                mqtt_connection.teardown()
+            except Exception as e:
+                logger.exception(e, label="MQTT client disconnect failed.")
+            logger.info("Stop: Disconnect MQTT client.")
 
         signal.signal(signal.SIGINT, _graceful_teardown)
         signal.signal(signal.SIGTERM, _graceful_teardown)