From 972b5a60f1b4d543e33e6bd599ff79477396a3eb Mon Sep 17 00:00:00 2001 From: Cedric Leporcq Date: Fri, 13 Aug 2021 19:14:24 +0200 Subject: [PATCH] Fix logging --- dozo.py | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dozo.py b/dozo.py index 4f63efc..d2a743f 100755 --- a/dozo.py +++ b/dozo.py @@ -34,11 +34,18 @@ def _batch(debug): plugins.run_batch() -def get_logger(level=logging.WARNING): +def get_logger(verbose, debug): + if debug: + level = logging.DEBUG + elif verbose: + level = logging.INFO + else: + level = logging.WARNING + logging.basicConfig(format='%(levelname)s:%(message)s', level=level) logging.debug('This message should appear on the console') logging.info('So should this') - logging.getLogger('asyncio').setLevel(logging.WARNING) + logging.getLogger('asyncio').setLevel(level) logger = logging.getLogger('dozo') logger.level = level return logger @@ -83,18 +90,11 @@ def _sort(debug, dry_run, destination, copy, exclude_regex, filter_by_ext, ignor else: mode = 'move' - if debug: - constants.debug = logging.DEBUG - elif verbose: - constants.debug = logging.INFO - else: - constants.debug = logging.WARNING + logger = get_logger(verbose, debug) if max_deep is not None: max_deep = int(max_deep) - logger = get_logger(constants.debug) - cache = True if reset_cache: cache = False @@ -221,18 +221,11 @@ def _compare(debug, dry_run, find_duplicates, output_dir, remove_duplicates, revert_compare, similar_to, similarity, verbose, path): '''Compare files in directories''' - logger = logging.getLogger('dozo') - if debug: - logger.setLevel(logging.DEBUG) - elif verbose: - logger.setLevel(logging.INFO) - else: - logger.setLevel(logging.ERROR) + logger = get_logger(verbose, debug) # Initialize Db db = Db(path) - logger = get_logger(constants.debug) filesystem = FileSystem(mode='move', dry_run=dry_run, logger=logger)