diff --git a/checks/impure/flake-module.nix b/checks/impure/flake-module.nix index b0865c6f..faeca31e 100644 --- a/checks/impure/flake-module.nix +++ b/checks/impure/flake-module.nix @@ -12,7 +12,7 @@ ]}" ROOT=$(git rev-parse --show-toplevel) cd "$ROOT/pkgs/clan-cli" - nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -m impure ./tests $@" + nix develop "$ROOT#clan-cli" -c bash -c "TMPDIR=/tmp python -m pytest -s -m impure ./tests $@" ''; }; } diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py index 20e83461..5948035d 100644 --- a/pkgs/clan-cli/clan_cli/__init__.py +++ b/pkgs/clan-cli/clan_cli/__init__.py @@ -124,6 +124,7 @@ def main() -> None: if args.debug: setup_logging(logging.DEBUG) log.debug("Debug log activated") + setup_logging(logging.INFO) if not hasattr(args, "func"): return diff --git a/pkgs/clan-cli/clan_cli/cmd.py b/pkgs/clan-cli/clan_cli/cmd.py index 16a4a0fa..450d131d 100644 --- a/pkgs/clan-cli/clan_cli/cmd.py +++ b/pkgs/clan-cli/clan_cli/cmd.py @@ -8,9 +8,10 @@ from enum import Enum from pathlib import Path from typing import IO, Any +from .custom_logger import get_caller from .errors import ClanCmdError, CmdOut -log = logging.getLogger(__name__) +glog = logging.getLogger(__name__) class Log(Enum): @@ -59,6 +60,7 @@ def run( check: bool = True, error_msg: str | None = None, ) -> CmdOut: + glog.debug(f"running command: {shlex.join(cmd)}. Caller: {get_caller()}") # Start the subprocess process = subprocess.Popen( cmd, diff --git a/pkgs/clan-cli/clan_cli/custom_logger.py b/pkgs/clan-cli/clan_cli/custom_logger.py index 2b62be6d..d6c85427 100644 --- a/pkgs/clan-cli/clan_cli/custom_logger.py +++ b/pkgs/clan-cli/clan_cli/custom_logger.py @@ -63,11 +63,18 @@ def get_caller() -> str: def setup_logging(level: Any) -> None: - handler = logging.StreamHandler() - handler.setLevel(level) - handler.setFormatter(CustomFormatter()) - logger = logging.getLogger("registerHandler") + # Get the root logger and set its level + root_logger = logging.getLogger() + root_logger.setLevel(level) + + # Create and add the default handler + default_handler = logging.StreamHandler() + + # Create and add your custom handler + default_handler.setLevel(level) + default_handler.setFormatter(CustomFormatter()) + root_logger.addHandler(default_handler) + + # Set logging level for other modules used by this module logging.getLogger("asyncio").setLevel(logging.INFO) logging.getLogger("httpx").setLevel(level=logging.WARNING) - logger.addHandler(handler) - # logging.basicConfig(level=level, handlers=[handler]) diff --git a/pkgs/clan-cli/tests/test_secrets_generate.py b/pkgs/clan-cli/tests/test_secrets_generate.py index 94b6f836..d9605fe1 100644 --- a/pkgs/clan-cli/tests/test_secrets_generate.py +++ b/pkgs/clan-cli/tests/test_secrets_generate.py @@ -33,7 +33,8 @@ def test_generate_secret( age_keys[0].pubkey, ] ) - cli.run(["--flake", str(test_flake_with_core.path), "secrets", "generate", "vm1"]) + cmd = ["--flake", str(test_flake_with_core.path), "secrets", "generate", "vm1"] + cli.run(cmd) has_secret(test_flake_with_core.path, "vm1-age.key") has_secret(test_flake_with_core.path, "vm1-zerotier-identity-secret") has_secret(test_flake_with_core.path, "vm1-zerotier-subnet")