From ad67dd3832320f571d23ef6d553854bae031f4c2 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 4 Apr 2020 13:43:08 +0200 Subject: [PATCH] jwutils.Cmds: Beautify log invocations Add from jwutils import log to avoid unnecessary jwutils.log module path. Signed-off-by: Jan Lindemann --- tools/python/jwutils/Cmds.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/python/jwutils/Cmds.py b/tools/python/jwutils/Cmds.py index 93ec98c..4bad7ca 100644 --- a/tools/python/jwutils/Cmds.py +++ b/tools/python/jwutils/Cmds.py @@ -7,6 +7,7 @@ import re import pickle import asyncio import jwutils +from jwutils import log class Cmds: # export @@ -14,7 +15,7 @@ class Cmds: # export self.__description = description self.__filter = filter self.__modules = modules - default_log_level = jwutils.log.NOTICE + default_log_level = log.NOTICE default_log_flags = 'stderr,position,prio,color' # poor man's parsing in the absence of a complete command-line definition for i in range(1, len(sys.argv)): @@ -28,8 +29,8 @@ class Cmds: # export if arg == '--log-flags': default_log_flags = sys.argv[i] continue - jwutils.log.set_flags(default_log_flags) - jwutils.log.set_level(default_log_level) + log.set_flags(default_log_flags) + log.set_level(default_log_level) self.__parser = argparse.ArgumentParser(usage=os.path.basename(sys.argv[0]) + ' [command] [options]', formatter_class=argparse.ArgumentDefaultsHelpFormatter, description=self.__description) self.__parser.add_argument('--log-flags', help='Log flags', default=default_log_flags) @@ -50,14 +51,15 @@ class Cmds: # export continue if inspect.isabstract(c): continue + log.slog(log.DEBUG, 'instantiating command "{}"'.format(c)) cmd = c() cmd.cmds = self cmd.add_parser(subparsers) async def __run(self): args = self.__parser.parse_args() - jwutils.log.set_flags(args.log_flags) - jwutils.log.set_level(args.log_level) + log.set_flags(args.log_flags) + log.set_level(args.log_level) return await args.func(args) def __del__(self):