diff --git a/aprsd/cli_helper.py b/aprsd/cli_helper.py index 52e9e02..faf5087 100644 --- a/aprsd/cli_helper.py +++ b/aprsd/cli_helper.py @@ -1,8 +1,9 @@ -import click from functools import update_wrapper import logging from pathlib import Path import typing as t + +import click from oslo_config import cfg import aprsd @@ -58,7 +59,7 @@ class AliasedGroup(click.Group): Copied from `click` and extended for `aliases`. """ def decorator(f): - aliases = kwargs.pop('aliases', []) + aliases = kwargs.pop("aliases", []) cmd = click.decorators.command(*args, **kwargs)(f) self.add_command(cmd) for alias in aliases: @@ -74,7 +75,7 @@ class AliasedGroup(click.Group): Copied from `click` and extended for `aliases`. """ def decorator(f): - aliases = kwargs.pop('aliases', []) + aliases = kwargs.pop("aliases", []) cmd = click.decorators.group(*args, **kwargs)(f) self.add_command(cmd) for alias in aliases: @@ -137,7 +138,7 @@ def process_standard_options_no_config(f: F) -> F: ctx.obj["loglevel"] = kwargs["loglevel"] ctx.obj["config_file"] = kwargs["config_file"] ctx.obj["quiet"] = kwargs["quiet"] - log.setup_logging_no_config( + log.setup_logging( ctx.obj["loglevel"], ctx.obj["quiet"], ) diff --git a/aprsd/log/log.py b/aprsd/log/log.py index 15ded90..ef0fbdc 100644 --- a/aprsd/log/log.py +++ b/aprsd/log/log.py @@ -1,5 +1,4 @@ import logging -from logging import NullHandler from logging.handlers import QueueHandler import queue import sys @@ -96,20 +95,3 @@ def setup_logging(loglevel=None, quiet=False): # configure loguru logger.configure(handlers=handlers) - - -def setup_logging_no_config(loglevel, quiet): - log_level = conf.log.LOG_LEVELS[loglevel] - LOG.setLevel(log_level) - log_format = CONF.logging.logformat - date_format = CONF.logging.date_format - log_formatter = logging.Formatter(fmt=log_format, datefmt=date_format) - fh = NullHandler() - - fh.setFormatter(log_formatter) - LOG.addHandler(fh) - - if not quiet: - sh = logging.StreamHandler(sys.stdout) - sh.setFormatter(log_formatter) - LOG.addHandler(sh)