From e97efb6b19642ba523d3d6ea71bb3b85c7f5e0ad Mon Sep 17 00:00:00 2001 From: Xoconoch Date: Sat, 7 Jun 2025 14:01:38 -0600 Subject: [PATCH] Clean log format --- app.py | 2 +- routes/__init__.py | 2 +- routes/utils/celery_manager.py | 14 +++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index 3a54956..5373b93 100755 --- a/app.py +++ b/app.py @@ -46,7 +46,7 @@ def setup_logging(): # Log formatting log_format = logging.Formatter( - "%(asctime)s [%(processName)s:%(threadName)s] [%(name)s] [%(levelname)s] - %(message)s", + "%(asctime)s [%(levelname)s] %(message)s", datefmt="%Y-%m-%d %H:%M:%S", ) diff --git a/routes/__init__.py b/routes/__init__.py index 9f959dc..4d89a25 100755 --- a/routes/__init__.py +++ b/routes/__init__.py @@ -4,7 +4,7 @@ import atexit # Configure basic logging for the application if not already configured # This is a good place for it if routes are a central part of your app structure. logging.basicConfig( - level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s" + level=logging.INFO, format="%(message)s" ) logger = logging.getLogger(__name__) diff --git a/routes/utils/celery_manager.py b/routes/utils/celery_manager.py index f2fcf40..1fc0504 100644 --- a/routes/utils/celery_manager.py +++ b/routes/utils/celery_manager.py @@ -69,8 +69,16 @@ class CeleryManager: try: for line in iter(stream.readline, ""): if line: - log_method = logger.error if error else logger.info - log_method(f"{log_prefix}: {line.strip()}") + line_stripped = line.strip() + log_method = logger.info # Default log method + + if error: # This is a stderr stream + if " - ERROR - " in line_stripped or " - CRITICAL - " in line_stripped: + log_method = logger.error + elif " - WARNING - " in line_stripped: + log_method = logger.warning + + log_method(f"{log_prefix}: {line_stripped}") elif ( self.stop_event.is_set() ): # If empty line and stop is set, likely EOF @@ -359,7 +367,7 @@ celery_manager = CeleryManager() if __name__ == "__main__": logging.basicConfig( level=logging.INFO, - format="%(asctime)s [%(levelname)s] [%(threadName)s] [%(name)s] - %(message)s", + format="%(message)s", ) logger.info("Starting Celery Manager example...") celery_manager.start()