diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index 14236c289709..5b90caf545a2 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -391,7 +391,7 @@ def execute(argv: list[str]) -> None: def main() -> None: ch = logging.StreamHandler() - ch.setFormatter(LogFormatter("%(levelname)s: %(message)s")) + ch.setFormatter(LogFormatter()) logger.addHandler(ch) try: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py index dc8d899ab056..cd89435f2d4f 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py @@ -5,17 +5,17 @@ Args: TypeAlias = bool | str | list[str] | int | None class LogFormatter(logging.Formatter): + formatters = { + logging.INFO: logging.Formatter("%(message)s"), + logging.DEBUG: logging.Formatter("%(levelname)s: %(name)s: %(message)s"), + "DEFAULT": logging.Formatter("%(levelname)s: %(message)s"), + } + @override def format(self, record: logging.LogRecord) -> str: record.levelname = record.levelname.lower() - match record.levelno: - case logging.INFO: - self._style._fmt = "%(message)s" - case logging.DEBUG: - self._style._fmt = "%(levelname)s: %(name)s: %(message)s" - case _: - self._style._fmt = "%(levelname)s: %(message)s" - return super().format(record) + formatter = self.formatters.get(record.levelno, self.formatters["DEFAULT"]) + return formatter.format(record) def dict_to_flags(d: dict[str, Args]) -> list[str]: