From 903bbe0b015120cd03a3974991f2936573321bd2 Mon Sep 17 00:00:00 2001
From: Nicolas Duhamel <nicolas@jombi.fr>
Date: Tue, 16 Mar 2021 17:54:22 +0100
Subject: [PATCH] Fix logging

---
 src/citadel/devices/__main__.py | 35 +++++++++++++++++----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/citadel/devices/__main__.py b/src/citadel/devices/__main__.py
index 2e2059c..9ab196c 100644
--- a/src/citadel/devices/__main__.py
+++ b/src/citadel/devices/__main__.py
@@ -16,6 +16,24 @@ def main(\
         is_systemd: bool = typer.Option(False, help="Is running as systemd unit", envvar="LAUNCHED_BY_SYSTEMD")\
         ):
 
+    if is_systemd:
+        logger = logging.getLogger()
+        logger.setLevel(logging.DEBUG)
+        logger.addHandler(systemd.journal.JournalHandler())
+    else:
+        logger = logging.getLogger()
+        logger.setLevel(logging.DEBUG)
+        # create console handler and set level to debug
+        ch = logging.StreamHandler()
+        ch.setLevel(logging.DEBUG)
+        # create formatter
+        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        # add formatter to ch
+        ch.setFormatter(formatter)
+        # add ch to logger
+        logger.addHandler(ch)
+
+
     client = Client()
     client.setup(mqtt_host, mqtt_port, mqtt_user, mqtt_pwd)
 
@@ -37,23 +55,6 @@ def main(\
                     CMND_TOPIC='cmnd/tasmota/light/{id}/POWER2')])
 
 
-    if is_systemd:
-        logger = logging.getLogger('')
-        logger.setLevel(logging.DEBUG)
-        logger.addHandler(systemd.journal.JournalHandler())
-    else:
-        logger = logging.getLogger('')
-        logger.setLevel(logging.DEBUG)
-        # create console handler and set level to debug
-        ch = logging.StreamHandler()
-        ch.setLevel(logging.DEBUG)
-        # create formatter
-        formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-        # add formatter to ch
-        ch.setFormatter(formatter)
-        # add ch to logger
-        logger.addHandler(ch)
-
     client.loop_forever()
 
 if __name__ == "__main__":