From 5e8597e1278fdfefaea3593c02153204fafb2e70 Mon Sep 17 00:00:00 2001 From: smathis Date: Fri, 5 Dec 2025 16:02:50 +0100 Subject: [PATCH] Fixed wrong default log level --- src/classes.py | 3 +-- tests/conftest.py | 12 +++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/classes.py b/src/classes.py index 59a9ed2..8d2e125 100755 --- a/src/classes.py +++ b/src/classes.py @@ -22,14 +22,13 @@ def setup_custom_logger(name): Formatting of the logger. Taken from: https://stackoverflow.com/questions/28330317/print-timestamp-for-logging-in-python """ - formatter = logging.Formatter(fmt='%(asctime)s %(levelname)-8s %(message)s', + formatter = logging.Formatter(fmt='%(asctime)s %(name)s %(levelname)-8s %(message)s', datefmt='%Y-%m-%d %H:%M:%S') handler = logging.FileHandler('log.txt', mode='w') handler.setFormatter(formatter) screen_handler = logging.StreamHandler(stream=sys.stdout) screen_handler.setFormatter(formatter) logger = logging.getLogger(name) - logger.setLevel(logging.DEBUG) logger.addHandler(handler) logger.addHandler(screen_handler) return logger diff --git a/tests/conftest.py b/tests/conftest.py index 5b7e73e..f4d49e8 100755 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -80,21 +80,15 @@ def parse_loglevel(value: str) -> int: @pytest.fixture(scope="session", autouse=True) -def configure_el734_logging(request): +def configure_motor_logging(request): loglevel_str = request.config.getoption("--log") level = parse_loglevel(loglevel_str) - logger = logging.getLogger("EL734") - logger.handlers.clear() # so pytest doesn't duplicate handlers + logger = logging.getLogger("motor") + logger.handlers.clear() handler = logging.StreamHandler() formatter = logging.Formatter("%(levelname)s [%(name)s]: %(message)s") handler.setFormatter(formatter) logger.addHandler(handler) logger.setLevel(level) - - # Set caproto logger level to INFO and disable propagation - caproto_logger = logging.getLogger("caproto") - caproto_logger.setLevel(logging.ERROR) - # Prevent caproto logs from propagatingto the root logger - caproto_logger.propagate = False