From 69cb95a154b9a7cac65623ca681355bcf2119dd1 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 20:48:57 +0200
Subject: [PATCH] Attemps to solve multiple loggers
---
hardware/abstract_hardware.py | 8 ++++++++
logging_setup.py | 2 +-
measure.py | 3 ---
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hardware/abstract_hardware.py b/hardware/abstract_hardware.py
index 1c45b6ca..b4c7e43b 100644
--- a/hardware/abstract_hardware.py
+++ b/hardware/abstract_hardware.py
@@ -6,10 +6,18 @@ class ControllerAbstract(ABC):
def __init__(self, **kwargs):
self.board_name = kwargs.pop('board_name', 'unknown Controller hardware')
self.bus = None
+ self.exec_logger = kwargs.pop('exec_logger', None)
+ if self.exec_logger is None:
+ self.exec_logger = create_stdout_logger('exec_ctl')
+ self.exec_logger.debug(f'{self.board_name} Controller initialization')
class MuxAbstract(ABC):
def __init__(self, **kwargs):
self.board_name = kwargs.pop('board_name', 'unknown MUX hardware')
+ self.exec_logger = kwargs.pop('exec_logger', None)
+ if self.exec_logger is None:
+ self.exec_logger = create_stdout_logger('exec_mux')
+ self.exec_logger.debug(f'{self.board_name} MUX initialization')
class TxAbstract(ABC):
def __init__(self, **kwargs):
diff --git a/logging_setup.py b/logging_setup.py
index 80c05231..1702ccb2 100644
--- a/logging_setup.py
+++ b/logging_setup.py
@@ -10,7 +10,7 @@ from termcolor import colored
def create_stdout_logger(name):
logger = logging.getLogger(f'{name}_logger')
- log_format = f'%(asctime)-15s | {name[:4]:4s} | %(levelname)s: %(message)s'
+ log_format = f'%(asctime)-15s | {name[:8]:8s} | %(levelname)s: %(message)s'
formatter = logging.Formatter(log_format)
formatter.converter = gmtime
formatter.datefmt = '%Y-%m-%d %H:%M:%S UTC'
diff --git a/measure.py b/measure.py
index 2f52185c..2ad805f8 100644
--- a/measure.py
+++ b/measure.py
@@ -48,9 +48,6 @@ class OhmPiHardware:
self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger,
data_logger=self.data_logger,
soh_logger=self.soh_logger))
- self.exec_logger.debug(f'TX: {self.tx.board_name}, RX: {self.rx.board_name}, MUX: {self.mux.board_name}, '
- f'Controller: {self.controller.board_name}')
-
def _inject(self, duration):
self.tx_sync.set()
--
GitLab