diff --git a/button.py b/button.py index 3d203c4..e904a94 100644 --- a/button.py +++ b/button.py @@ -2,7 +2,8 @@ import json from dataclasses import dataclass from appdaemon.plugins.mqtt.mqttapi import Mqtt -from console import console, init_logging +from console import init_logging + from room_control import RoomController @@ -32,10 +33,7 @@ class Button(Mqtt): topic = f'zigbee2mqtt/{name}' # self.mqtt_subscribe(topic, namespace='mqtt') self.listen_event(self.handle_button, 'MQTT_MESSAGE', topic=topic, namespace='mqtt', button=name) - if self.rich: - self.log(f'MQTT topic [blue]{topic}[/] controls app [green]{self.app.name}[/]') - else: - self.log(f'MQTT topic "{topic}" controls app {self.app.name}') + self.log(f'MQTT topic [blue]{topic}[/] controls app [green]{self.app.name}[/]') def handle_button(self, event_name, data, kwargs): try: @@ -51,7 +49,7 @@ class Button(Mqtt): def handle_action(self, action: str): if isinstance(action, str): - action_str = f' [yellow]{action.upper()}[/] ' if self.rich else f' {action.upper()} ' + action_str = f' [yellow]{action.upper()}[/] ' if action == 'single': self.log(action_str.center(80, '=')) diff --git a/console.py b/console.py index 96dc96a..4f0fec4 100644 --- a/console.py +++ b/console.py @@ -36,9 +36,11 @@ def create_handler() -> RichHandler: def init_logging(self: ADAPI, level): - stream_handler = logging.getLogger('AppDaemon').handlers[0] - og_formatter = stream_handler.formatter - stream_handler.setFormatter(UnMarkupFormatter(fmt=og_formatter._fmt, datefmt=og_formatter.datefmt, style='{')) + for h in logging.getLogger('AppDaemon').handlers: + og_formatter = h.formatter + h.setFormatter( + UnMarkupFormatter(fmt=og_formatter._fmt, datefmt=og_formatter.datefmt, style='{') + ) if not any(isinstance(h, RichHandler) for h in self.logger.handlers): self.logger.propagate = False