From 10d26beaa1c054c47474874564d7e1af2df92a28 Mon Sep 17 00:00:00 2001 From: Jethro Rainford Date: Thu, 10 Oct 2024 09:52:01 +0100 Subject: [PATCH] split out setting logger file handle --- s3_upload/s3_upload.py | 4 +++- s3_upload/utils/log.py | 25 +++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/s3_upload/s3_upload.py b/s3_upload/s3_upload.py index f77f6cc..231b7f0 100644 --- a/s3_upload/s3_upload.py +++ b/s3_upload/s3_upload.py @@ -19,7 +19,7 @@ verify_args, verify_config, ) -from utils.log import get_logger +from utils.log import get_logger, set_file_handler log = get_logger("s3 upload") @@ -241,6 +241,8 @@ def main() -> None: args = parse_args() if args.mode == "upload": + set_file_handler(log, "/var/log/s3_upload") + exit() upload_single_run(args) else: config = read_config(config=args.config) diff --git a/s3_upload/utils/log.py b/s3_upload/utils/log.py index 65aaa72..61ea81a 100644 --- a/s3_upload/utils/log.py +++ b/s3_upload/utils/log.py @@ -16,12 +16,29 @@ def get_console_handler(): return console_handler -def get_file_handler(log_file): +def set_file_handler(logger, log_file) -> None: + check_write_permission_to_log_dir(Path(log_file).parent) + file_handler = TimedRotatingFileHandler( log_file, when="midnight", backupCount=5 ) file_handler.setFormatter(FORMATTER) - return file_handler + + logger.addHandler(file_handler) + # return file_handler + + +# def set_file_handler(logger, log_file) -> None: +# """ +# _summary_ + +# Parameters +# ---------- +# logger : _type_ +# _description_ +# log_file : _type_ +# _description_ +# """ def check_write_permission_to_log_dir(log_dir) -> None: @@ -83,8 +100,6 @@ def get_logger( # logger already exists => use it return logging.getLogger(logger_name) - check_write_permission_to_log_dir(log_dir) - log_file = os.path.join(log_dir, "s3_upload.log") Path(log_dir).mkdir(parents=True, exist_ok=True) @@ -96,8 +111,6 @@ def get_logger( logger.setLevel(log_level) logger.addHandler(get_console_handler()) - logger.addHandler(get_file_handler(log_file)) - logger.propagate = False logger.info("Initialised log handle, beginning logging to %s", log_file)