diff --git a/pkgs/clan-app/clan_app/app.py b/pkgs/clan-app/clan_app/app.py index 038b9e39c..063e5e9b9 100644 --- a/pkgs/clan-app/clan_app/app.py +++ b/pkgs/clan-app/clan_app/app.py @@ -23,11 +23,9 @@ class ClanAppOptions: @profile def app_run(app_opts: ClanAppOptions) -> int: if app_opts.debug: - setup_logging(logging.DEBUG, root_log_name=__name__.split(".")[0]) - setup_logging(logging.DEBUG, root_log_name="clan_cli") + setup_logging(logging.DEBUG) else: - setup_logging(logging.INFO, root_log_name=__name__.split(".")[0]) - setup_logging(logging.INFO, root_log_name="clan_cli") + setup_logging(logging.INFO) log.debug("Debug mode enabled") diff --git a/pkgs/clan-app/tests/conftest.py b/pkgs/clan-app/tests/conftest.py index 377d1b5f9..21e30af95 100644 --- a/pkgs/clan-app/tests/conftest.py +++ b/pkgs/clan-app/tests/conftest.py @@ -1,5 +1,6 @@ from __future__ import annotations +import logging import subprocess from pathlib import Path @@ -22,7 +23,7 @@ def pytest_sessionstart(session: pytest.Session) -> None: # You can access the session config, items, testsfailed, etc. print(f"Session config: {session.config}") - setup_logging(level="DEBUG") + setup_logging(logging.DEBUG) # fixture for git_repo diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py index 4b6eec01b..0ca471bb9 100644 --- a/pkgs/clan-cli/clan_cli/__init__.py +++ b/pkgs/clan-cli/clan_cli/__init__.py @@ -452,10 +452,10 @@ def main() -> None: parser.print_help() if debug := getattr(args, "debug", False): - setup_logging(logging.DEBUG, root_log_name=__name__.split(".")[0]) + setup_logging(logging.DEBUG) log.debug("Debug log activated") else: - setup_logging(logging.INFO, root_log_name=__name__.split(".")[0]) + setup_logging(logging.INFO) if not hasattr(args, "func"): return diff --git a/pkgs/clan-cli/clan_cli/custom_logger.py b/pkgs/clan-cli/clan_cli/custom_logger.py index beebdcef0..831e97759 100644 --- a/pkgs/clan-cli/clan_cli/custom_logger.py +++ b/pkgs/clan-cli/clan_cli/custom_logger.py @@ -3,7 +3,6 @@ import logging import os import sys from pathlib import Path -from typing import Any from clan_cli.colors import AnsiColor, RgbColor, color_by_tuple @@ -153,19 +152,13 @@ def print_trace(msg: str, logger: logging.Logger, prefix: str | None) -> None: logger.debug(f"{msg} \n{callers_str}", extra={"command_prefix": prefix}) -def setup_logging( - level: Any, - root_log_name: str = __name__.split(".")[0], -) -> None: - # Get the root logger and set its level - main_logger = logging.getLogger(root_log_name) - main_logger.setLevel(level) +def setup_logging(level: int) -> None: + root_logger = logging.getLogger() + root_logger.setLevel(level) - # Create and add the default handler + # Set our formatter handler default_handler = logging.StreamHandler() - - # Create and add your custom handler default_handler.setLevel(level) trace_prints = bool(int(os.environ.get("TRACE_PRINT", "0"))) default_handler.setFormatter(PrefixFormatter(trace_prints)) - main_logger.addHandler(default_handler) + root_logger.addHandler(default_handler) diff --git a/pkgs/clan-cli/conftest.py b/pkgs/clan-cli/conftest.py index 378797ef8..16b11874d 100644 --- a/pkgs/clan-cli/conftest.py +++ b/pkgs/clan-cli/conftest.py @@ -1,3 +1,5 @@ +import logging + import pytest from clan_cli.custom_logger import setup_logging @@ -19,4 +21,4 @@ def pytest_sessionstart(session: pytest.Session) -> None: # You can access the session config, items, testsfailed, etc. print(f"Session config: {session.config}") - setup_logging(level="INFO") + setup_logging(logging.DEBUG) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py index d247f7f68..4aaab58f4 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/app.py @@ -71,10 +71,9 @@ class MainApplication(Adw.Application): options = options.end().unpack() if "debug" in options and self.window is None: - setup_logging(logging.DEBUG, root_log_name=__name__.split(".")[0]) - setup_logging(logging.DEBUG, root_log_name="clan_cli") + setup_logging(logging.DEBUG) elif self.window is None: - setup_logging(logging.INFO, root_log_name=__name__.split(".")[0]) + setup_logging(logging.INFO) log.debug("Debug logging enabled") if "debug" in options: diff --git a/pkgs/clan-vm-manager/tests/conftest.py b/pkgs/clan-vm-manager/tests/conftest.py index 6b0a25fcb..27154d15b 100644 --- a/pkgs/clan-vm-manager/tests/conftest.py +++ b/pkgs/clan-vm-manager/tests/conftest.py @@ -1,3 +1,4 @@ +import logging import subprocess import sys from pathlib import Path @@ -27,7 +28,7 @@ def pytest_sessionstart(session: pytest.Session) -> None: # You can access the session config, items, testsfailed, etc. print(f"Session config: {session.config}") - setup_logging(level="DEBUG") + setup_logging(logging.DEBUG) # fixture for git_repo