diff --git a/cmk/piggyback_hub/main.py b/cmk/piggyback_hub/main.py index 58a428b5713..c34a8d39a12 100644 --- a/cmk/piggyback_hub/main.py +++ b/cmk/piggyback_hub/main.py @@ -17,7 +17,7 @@ from cmk.ccc.daemon import daemonize, pid_file_lock -from cmk.messaging import QueueName +from cmk.messaging import QueueName, set_logging_level from .config import CONFIG_QUEUE, PiggybackHubConfig, save_config_on_message from .payload import ( @@ -76,7 +76,7 @@ def _parse_arguments(argv: list[str]) -> Arguments: def _setup_logging(args: Arguments) -> logging.Logger: - logger = getLogger("cmk.piggyback_hub") + logger = getLogger(__name__) handler: logging.StreamHandler | WatchedFileHandler = ( logging.StreamHandler(stream=sys.stderr) if args.foreground @@ -85,7 +85,9 @@ def _setup_logging(args: Arguments) -> logging.Logger: handler.setFormatter(logging.Formatter("%(asctime)s [%(levelname)s] [%(process)d] %(message)s")) logger.addHandler(handler) - logger.setLevel(VERBOSITY_MAP[min(args.verbosity, 2)]) + level = VERBOSITY_MAP[min(args.verbosity, 2)] + logger.setLevel(level) + set_logging_level(level) return logger diff --git a/packages/cmk-messaging/BUILD b/packages/cmk-messaging/BUILD index 0ebfe9ef070..b8fbee8b76f 100644 --- a/packages/cmk-messaging/BUILD +++ b/packages/cmk-messaging/BUILD @@ -15,6 +15,7 @@ py_library( "cmk/messaging/_config.py", "cmk/messaging/_connection.py", "cmk/messaging/_constants.py", + "cmk/messaging/_logging.py", "cmk/messaging/rabbitmq.py", ], imports = ["."], diff --git a/packages/cmk-messaging/cmk/messaging/__init__.py b/packages/cmk-messaging/cmk/messaging/__init__.py index 5b684e82e19..2ec62bfb5f4 100644 --- a/packages/cmk-messaging/cmk/messaging/__init__.py +++ b/packages/cmk-messaging/cmk/messaging/__init__.py @@ -33,6 +33,7 @@ QueueName, RoutingKey, ) +from ._logging import set_logging_level __all__ = [ "all_cme_cacert_files", @@ -56,6 +57,7 @@ "QueueName", "rabbitmq", "RoutingKey", + "set_logging_level", "site_cert_file", "site_key_file", "TLS_PATH_CUSTOMERS", diff --git a/packages/cmk-messaging/cmk/messaging/_logging.py b/packages/cmk-messaging/cmk/messaging/_logging.py new file mode 100644 index 00000000000..696e6291184 --- /dev/null +++ b/packages/cmk-messaging/cmk/messaging/_logging.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python3 +# Copyright (C) 2024 Checkmk GmbH - License: GNU General Public License v2 +# This file is part of Checkmk (https://checkmk.com). It is subject to the terms and +# conditions defined in the file COPYING, which is part of this source code package. +"""Logging""" + +import logging + +import pika + + +def set_logging_level(level: int, /) -> None: + """Set the logging level for underlying library""" + logging.getLogger(pika.__name__).setLevel(level)