From 28302f67a30e061d771a5607f67b2b03b1205a7d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 3 Sep 2020 13:13:24 +0530 Subject: [PATCH 1/2] fix: Log in ~/bench.log if not running inside bench directory --- bench/cli.py | 2 +- bench/utils.py | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/bench/cli.py b/bench/cli.py index de949aba..b3eb871d 100755 --- a/bench/cli.py +++ b/bench/cli.py @@ -27,7 +27,7 @@ def cli(): command = " ".join(sys.argv) change_working_directory() - logger = setup_logging() or logging.getLogger(bench.PROJECT_NAME) + logger = setup_logging() logger.info(command) check_uid() change_dir() diff --git a/bench/utils.py b/bench/utils.py index 4a4fa813..7e2f6662 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -443,15 +443,18 @@ def setup_logging(bench_path='.'): logging.Logger.log = logv if os.path.exists(os.path.join(bench_path, 'logs')): - logger = logging.getLogger(bench.PROJECT_NAME) log_file = os.path.join(bench_path, 'logs', 'bench.log') - formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') - hdlr = logging.FileHandler(log_file) - hdlr.setFormatter(formatter) - logger.addHandler(hdlr) - logger.setLevel(logging.DEBUG) + else: + log_file = os.path.join(os.path.expanduser("~"), 'bench.log') - return logger + logger = logging.getLogger(bench.PROJECT_NAME) + formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') + hdlr = logging.FileHandler(log_file) + hdlr.setFormatter(formatter) + logger.addHandler(hdlr) + logger.setLevel(logging.DEBUG) + + return logger def get_process_manager(): From 31f2999b4b971176b57c09ecef5d5edfe39dcb53 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 10 Sep 2020 10:10:55 +0530 Subject: [PATCH 2/2] fix: Use NullHandler for commands executed outside a bench dir --- bench/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/utils.py b/bench/utils.py index 7e2f6662..8e76903f 100755 --- a/bench/utils.py +++ b/bench/utils.py @@ -444,12 +444,12 @@ def setup_logging(bench_path='.'): if os.path.exists(os.path.join(bench_path, 'logs')): log_file = os.path.join(bench_path, 'logs', 'bench.log') + hdlr = logging.FileHandler(log_file) else: - log_file = os.path.join(os.path.expanduser("~"), 'bench.log') + hdlr = logging.NullHandler() logger = logging.getLogger(bench.PROJECT_NAME) formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') - hdlr = logging.FileHandler(log_file) hdlr.setFormatter(formatter) logger.addHandler(hdlr) logger.setLevel(logging.DEBUG)