From 4527eaa9310a08b6cac9afcf79407827629fd01e Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Mon, 13 Aug 2018 15:17:54 +0300 Subject: [PATCH] Refactor log configuration --- amodem/__main__.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/amodem/__main__.py b/amodem/__main__.py index 2e5e39e..4dd00b2 100644 --- a/amodem/__main__.py +++ b/amodem/__main__.py @@ -197,6 +197,20 @@ def _version(): return pkg_resources.require('amodem')[0].version +def _config_log(args): + if args.verbose == 0: + level, fmt = 'INFO', '%(message)s' + elif args.verbose == 1: + level, fmt = 'DEBUG', '%(message)s' + elif args.verbose >= 2: + level, fmt = ('DEBUG', '%(asctime)s %(levelname)-10s ' + '%(message)-100s ' + '%(filename)s:%(lineno)d') + if args.quiet: + level, fmt = 'WARNING', '%(message)s' + logging.basicConfig(level=level, format=fmt) + + def _main(): fmt = ('Audio OFDM MODEM v{0:s}: ' '{1:.1f} kb/s ({2:d}-QAM x {3:d} carriers) ' @@ -212,17 +226,7 @@ def _main(): p = create_parser(description, interface_factory) args = p.parse_args() - if args.verbose == 0: - level, fmt = 'INFO', '%(message)s' - elif args.verbose == 1: - level, fmt = 'DEBUG', '%(message)s' - elif args.verbose >= 2: - level, fmt = ('DEBUG', '%(asctime)s %(levelname)-10s ' - '%(message)-100s ' - '%(filename)s:%(lineno)d') - if args.quiet: - level, fmt = 'WARNING', '%(message)s' - logging.basicConfig(level=level, format=fmt) + _config_log(args) # Parsing and execution log.info(description)