cli logging mode

This commit is contained in:
Maxim Devaev 2022-06-19 22:30:17 +03:00
parent 804bb68ae3
commit a70800323e
5 changed files with 10 additions and 0 deletions

View File

@ -113,6 +113,7 @@ def init(
description: Optional[str]=None, description: Optional[str]=None,
add_help: bool=True, add_help: bool=True,
check_run: bool=False, check_run: bool=False,
cli_logging: bool=False,
argv: Optional[List[str]]=None, argv: Optional[List[str]]=None,
**load: bool, **load: bool,
) -> Tuple[argparse.ArgumentParser, List[str], Section]: ) -> Tuple[argparse.ArgumentParser, List[str], Section]:
@ -152,6 +153,11 @@ def init(
logging.captureWarnings(True) logging.captureWarnings(True)
logging.config.dictConfig(config.logging) logging.config.dictConfig(config.logging)
if cli_logging:
logging.getLogger().handlers[0].setFormatter(logging.Formatter(
"-- {levelname:>7} -- {message}",
style="{",
))
if check_run and not options.run: if check_run and not options.run:
raise SystemExit( raise SystemExit(

View File

@ -128,6 +128,7 @@ def _cmd_delete(config: Section, options: argparse.Namespace) -> None:
def main(argv: Optional[List[str]]=None) -> None: def main(argv: Optional[List[str]]=None) -> None:
(parent_parser, argv, config) = init( (parent_parser, argv, config) = init(
add_help=False, add_help=False,
cli_logging=True,
argv=argv, argv=argv,
load_auth=True, load_auth=True,
) )

View File

@ -114,6 +114,7 @@ class _GadgetControl:
def main(argv: Optional[List[str]]=None) -> None: def main(argv: Optional[List[str]]=None) -> None:
(parent_parser, argv, config) = init( (parent_parser, argv, config) = init(
add_help=False, add_help=False,
cli_logging=True,
argv=argv, argv=argv,
) )
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(

View File

@ -60,6 +60,7 @@ def _set_param(gadget: str, instance: int, param: str, value: str) -> None:
def main(argv: Optional[List[str]]=None) -> None: def main(argv: Optional[List[str]]=None) -> None:
(parent_parser, argv, config) = init( (parent_parser, argv, config) = init(
add_help=False, add_help=False,
cli_logging=True,
argv=argv, argv=argv,
load_msd=True, load_msd=True,
) )

View File

@ -112,6 +112,7 @@ async def _run_cmd(cmd: List[str], unix_path: str) -> None:
def main(argv: Optional[List[str]]=None) -> None: def main(argv: Optional[List[str]]=None) -> None:
(parent_parser, argv, config) = init( (parent_parser, argv, config) = init(
add_help=False, add_help=False,
cli_logging=True,
argv=argv, argv=argv,
) )
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(