jadepy: nest loggers following the standard convention

Blockstream · Aug 4, 2023 · a0c7eff · a0c7eff
1 parent 59c4877
commit a0c7eff
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/components/assets/gen_assets.py b/components/assets/gen_assets.py
@@ -4,7 +4,7 @@
 import os
 
 # Enable logging
-logger = logging.getLogger('gen_assets')
+logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 
 

diff --git a/jade_auth.py b/jade_auth.py
@@ -19,11 +19,11 @@
     jadehandler = logging.StreamHandler()
     jadehandler.setLevel(logging.INFO)
 
-    logger = logging.getLogger('jade')
+    logger = logging.getLogger('jadepy.jade')
     logger.setLevel(logging.DEBUG)
     logger.addHandler(jadehandler)
 
-    logger = logging.getLogger('jade-device')
+    logger = logging.getLogger('jadepy.jade-device')
     logger.setLevel(logging.DEBUG)
     logger.addHandler(jadehandler)
 

diff --git a/jade_capture_image_data.py b/jade_capture_image_data.py
@@ -13,11 +13,11 @@
     jadehandler = logging.StreamHandler()
     jadehandler.setLevel(LOGGING)
 
-    logger = logging.getLogger('jade')
+    logger = logging.getLogger('jadepy.jade')
     logger.setLevel(LOGGING)
     logger.addHandler(jadehandler)
 
-    device_logger = logging.getLogger('jade-device')
+    device_logger = logging.getLogger('jadepy.jade-device')
     device_logger.setLevel(LOGGING)
     device_logger.addHandler(jadehandler)
 

diff --git a/jade_ota.py b/jade_ota.py
@@ -27,11 +27,11 @@
 # Enable jade debug logging
 jadehandler = logging.StreamHandler()
 
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.DEBUG)
 logger.addHandler(jadehandler)
 
-device_logger = logging.getLogger('jade-device')
+device_logger = logging.getLogger('jadepy.jade-device')
 device_logger.setLevel(logging.DEBUG)
 device_logger.addHandler(jadehandler)
 

diff --git a/jadepy/jade.py b/jadepy/jade.py
@@ -17,8 +17,8 @@
 from .jade_tcp import JadeTCPImpl
 
 # 'jade' logger
-logger = logging.getLogger('jade')
-device_logger = logging.getLogger('jade-device')
+logger = logging.getLogger(__name__)
+device_logger = logging.getLogger(f'{__name__}-device')
 
 # BLE comms backend is optional
 # It relies on the BLE dependencies being available

diff --git a/jadepy/jade_ble.py b/jadepy/jade_ble.py
@@ -8,7 +8,7 @@
 
 from .jade_error import JadeError
 
-logger = logging.getLogger('jade.ble')
+logger = logging.getLogger(__name__)
 
 
 #

diff --git a/jadepy/jade_serial.py b/jadepy/jade_serial.py
@@ -3,7 +3,7 @@
 
 from serial.tools import list_ports
 
-logger = logging.getLogger('jade.serial')
+logger = logging.getLogger(__name__)
 
 
 #

diff --git a/jadepy/jade_tcp.py b/jadepy/jade_tcp.py
@@ -2,7 +2,7 @@
 import logging
 
 
-logger = logging.getLogger('jade.tcp')
+logger = logging.getLogger(__name__)
 
 
 #

diff --git a/set_jade_pinserver.py b/set_jade_pinserver.py
@@ -9,11 +9,11 @@
 # Enable jade logging
 jadehandler = logging.StreamHandler()
 
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.INFO)
 logger.addHandler(jadehandler)
 
-device_logger = logging.getLogger('jade-device')
+device_logger = logging.getLogger('jadepy.jade-device')
 device_logger.setLevel(logging.INFO)
 device_logger.addHandler(jadehandler)
 

diff --git a/test_jade.py b/test_jade.py
@@ -20,11 +20,11 @@
 # Enable jade logging
 jadehandler = logging.StreamHandler()
 
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.DEBUG)
 logger.addHandler(jadehandler)
 
-device_logger = logging.getLogger('jade-device')
+device_logger = logging.getLogger('jadepy.jade-device')
 device_logger.setLevel(logging.DEBUG)
 device_logger.addHandler(jadehandler)
 

diff --git a/tools/fwprep.py b/tools/fwprep.py
@@ -8,7 +8,7 @@
 import fwtools
 
 # Enable logging
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.INFO)
 
 

diff --git a/tools/fwtools.py b/tools/fwtools.py
@@ -10,7 +10,7 @@
 FWFILE_TYPE_HASH = 'fw.bin.hash'
 FWFILE_TYPE_PATCH = 'patch.bin'
 
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 
 
 # Prefix a directory to an existing filename/path

diff --git a/tools/mkindex.py b/tools/mkindex.py
@@ -9,7 +9,7 @@
 import fwtools
 
 # Enable logging
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.INFO)
 
 INDEX_FILENAME = 'index.json'

diff --git a/tools/mkpatch.py b/tools/mkpatch.py
@@ -8,7 +8,7 @@
 import fwtools
 
 # Enable logging
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.INFO)
 
 

diff --git a/update_jade_fw.py b/update_jade_fw.py
@@ -16,10 +16,10 @@
 
 # Enable jade logging
 jadehandler = logging.StreamHandler()
-logger = logging.getLogger('jade')
+logger = logging.getLogger('jadepy.jade')
 logger.setLevel(logging.DEBUG)
 logger.addHandler(jadehandler)
-device_logger = logging.getLogger('jade-device')
+device_logger = logging.getLogger('jadepy.jade-device')
 device_logger.setLevel(logging.DEBUG)
 device_logger.addHandler(jadehandler)