From a4e0ab82e350133bd23bf538a684fb493516b87b Mon Sep 17 00:00:00 2001 From: Maximilian Soelch Date: Thu, 28 Dec 2023 12:20:09 +0100 Subject: [PATCH] Add timestamp also to requests --- .../assessment_module_manager/__main__.py | 3 ++- assessment_module_manager/assessment_module_manager/logger.py | 2 +- athena/athena/app.py | 3 ++- athena/athena/logger.py | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assessment_module_manager/assessment_module_manager/__main__.py b/assessment_module_manager/assessment_module_manager/__main__.py index d75fb6b38..76e8e8b77 100644 --- a/assessment_module_manager/assessment_module_manager/__main__.py +++ b/assessment_module_manager/assessment_module_manager/__main__.py @@ -13,7 +13,8 @@ def main(): """ Start the assessment module manager using uvicorn. """ - LOGGING_CONFIG["formatters"]["default"]["fmt"] = "%(asctime)s %(levelprefix)s %(message)s" + LOGGING_CONFIG["formatters"]["default"]["fmt"] = "%(asctime)s - [%(name)s] - %(levelprefix)s %(message)s" + LOGGING_CONFIG["formatters"]["access"]["fmt"] = "%(asctime)s - [%(name)s] - %(levelprefix)s %(message)s" logger.info("Starting assessment module manager") if env.PRODUCTION: diff --git a/assessment_module_manager/assessment_module_manager/logger.py b/assessment_module_manager/assessment_module_manager/logger.py index e0c2fce9a..fb948859a 100644 --- a/assessment_module_manager/assessment_module_manager/logger.py +++ b/assessment_module_manager/assessment_module_manager/logger.py @@ -6,6 +6,6 @@ logger.setLevel(DEBUG) handler = StreamHandler(sys.stdout) handler.setLevel(DEBUG) -formatter = Formatter('%(asctime)s [%(levelname)s] %(message)s') +formatter = Formatter('%(asctime)s - [assessment_module_manager] - %(levelname)s %(message)s') handler.setFormatter(formatter) logger.addHandler(handler) diff --git a/athena/athena/app.py b/athena/athena/app.py index 4e2bf1bfe..43b251a23 100644 --- a/athena/athena/app.py +++ b/athena/athena/app.py @@ -32,7 +32,8 @@ def __init__(self, *args, **kwargs): def start(self) -> None: """Start Athena. You have to ensure to have `app` in your module main scope so that it can be imported.""" - LOGGING_CONFIG["formatters"]["default"]["fmt"] = "%(asctime)s %(levelprefix)s %(message)s" + LOGGING_CONFIG["formatters"]["default"]["fmt"] = "%(asctime)s - [%(name)s] - %(levelprefix)s %(message)s" + LOGGING_CONFIG["formatters"]["access"]["fmt"] = "%(asctime)s - [%(name)s] - %(levelprefix)s %(message)s" logger.info("Starting athena module") conf = get_module_config() diff --git a/athena/athena/logger.py b/athena/athena/logger.py index d24939a19..97f558b32 100644 --- a/athena/athena/logger.py +++ b/athena/athena/logger.py @@ -7,6 +7,6 @@ logger.setLevel(DEBUG) handler = StreamHandler(sys.stdout) handler.setLevel(DEBUG) -formatter = Formatter('%(asctime)s [%(levelname)s] %(message)s') +formatter = Formatter('%(asctime)s - [athena] - %(levelname)s %(message)s') handler.setFormatter(formatter) logger.addHandler(handler)