From b278a3cda1e512d8cdace29005d01a0c5c8ab955 Mon Sep 17 00:00:00 2001 From: John Lancaster <32917998+jsl12@users.noreply.github.com> Date: Sat, 27 Jul 2024 20:52:08 -0500 Subject: [PATCH] changed default of load_rich_config --- src/room_control/button.py | 4 +--- src/room_control/console.py | 6 ++++-- src/room_control/door.py | 4 +--- src/room_control/motion.py | 4 +--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/room_control/button.py b/src/room_control/button.py index 311fa8c..dfa44de 100644 --- a/src/room_control/button.py +++ b/src/room_control/button.py @@ -14,9 +14,7 @@ class Button: button_name: str def __post_init__(self): - self.logger = console.load_rich_config( - self.adapi.name, 'Button', level=self.adapi.args.get('log_level', 'INFO') - ) + self.logger = console.load_rich_config(self.adapi.name, 'Button') topic = f'zigbee2mqtt/{self.button_name}' self.adapi.listen_event( self.handle_button, diff --git a/src/room_control/console.py b/src/room_control/console.py index 630375e..a1c1906 100644 --- a/src/room_control/console.py +++ b/src/room_control/console.py @@ -46,7 +46,7 @@ class RCHighlighter(RegexHighlighter): def load_rich_config( - room: str = None, component: str = None, level: str = 'INFO' + room: str = None, component: str = None, level: str = None ) -> logging.LoggerAdapter: logger_name = f'Appdaemon.{room}' @@ -64,7 +64,6 @@ def load_rich_config( logger_name: { 'handlers': ['rich' if component is None else 'rich_component'], 'propagate': False, - 'level': level, } } @@ -73,6 +72,9 @@ def load_rich_config( if component is not None: extra['component'] = component + if level is not None: + RICH_CFG['loggers'][logger_name]['level'] = level + logging.config.dictConfig(RICH_CFG) logger = logging.getLogger(logger_name) adapter = logging.LoggerAdapter(logger, extra) diff --git a/src/room_control/door.py b/src/room_control/door.py index 1b6b105..b3d75ec 100644 --- a/src/room_control/door.py +++ b/src/room_control/door.py @@ -13,9 +13,7 @@ class Door: entity_id: str def __post_init__(self): - self.logger = console.load_rich_config( - self.adapi.name, 'Door', level=self.adapi.args.get('log_level', 'INFO') - ) + self.logger = console.load_rich_config(self.adapi.name, 'Door') self.adapi.listen_state( lambda *args, **kwargs: self.adapi.activate_all_off(cause='door open'), diff --git a/src/room_control/motion.py b/src/room_control/motion.py index baf51fc..f6e5769 100644 --- a/src/room_control/motion.py +++ b/src/room_control/motion.py @@ -32,9 +32,7 @@ class MotionSensor: ref_entity_id: str def __post_init__(self): - self.logger = console.load_rich_config( - self.adapi.name, 'Motion', level=self.adapi.args.get('log_level', 'INFO') - ) + self.logger = console.load_rich_config(self.adapi.name, 'Motion') assert self.sensor_entity.exists() assert self.ref_entity.exists()