hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-03-08 04:18:59 -05:00
Code Issues Projects Releases Wiki Activity

Fixed problem with list-plugins

Browse Source 
This patch includes a fix to the list-plugins and
list-extensions commands.
This commit is contained in:
Hemna 2024-03-12 10:36:26 -04:00
parent c37e1d58bb
commit cb9456b29d
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aprsd/cli_helper.py
View File

@ -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"],
)

18
aprsd/log/log.py
View File

@ -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)