Commit 69cb95a1 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Attemps to solve multiple loggers

No related merge requests found
Showing with 9 additions and 4 deletions
+9 -4
...@@ -6,10 +6,18 @@ class ControllerAbstract(ABC): ...@@ -6,10 +6,18 @@ class ControllerAbstract(ABC):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.board_name = kwargs.pop('board_name', 'unknown Controller hardware') self.board_name = kwargs.pop('board_name', 'unknown Controller hardware')
self.bus = None 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): class MuxAbstract(ABC):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.board_name = kwargs.pop('board_name', 'unknown MUX hardware') 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): class TxAbstract(ABC):
def __init__(self, **kwargs): def __init__(self, **kwargs):
......
...@@ -10,7 +10,7 @@ from termcolor import colored ...@@ -10,7 +10,7 @@ from termcolor import colored
def create_stdout_logger(name): def create_stdout_logger(name):
logger = logging.getLogger(f'{name}_logger') 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 = logging.Formatter(log_format)
formatter.converter = gmtime formatter.converter = gmtime
formatter.datefmt = '%Y-%m-%d %H:%M:%S UTC' formatter.datefmt = '%Y-%m-%d %H:%M:%S UTC'
......
...@@ -48,9 +48,6 @@ class OhmPiHardware: ...@@ -48,9 +48,6 @@ class OhmPiHardware:
self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger, self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger,
data_logger=self.data_logger, data_logger=self.data_logger,
soh_logger=self.soh_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): def _inject(self, duration):
self.tx_sync.set() self.tx_sync.set()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment