From ee8cef5aa9d16c91f854147133f1b7c894f57f49 Mon Sep 17 00:00:00 2001 From: SergeantPanda Date: Sat, 10 May 2025 14:13:43 -0500 Subject: [PATCH] Cleaned up logging. --- apps/m3u/tasks.py | 4 ++-- dispatcharr/celery.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/m3u/tasks.py b/apps/m3u/tasks.py index 5a0066cd..f6b1044c 100644 --- a/apps/m3u/tasks.py +++ b/apps/m3u/tasks.py @@ -840,7 +840,7 @@ def refresh_single_m3u_account(account_id): try: logger.info(f"Calling refresh_m3u_groups for account {account_id}") result = refresh_m3u_groups(account_id, full_refresh=True) - logger.debug(f"refresh_m3u_groups result: {result}") + logger.trace(f"refresh_m3u_groups result: {result}") # Check for completely empty result or missing groups if not result or result[1] is None: @@ -1009,7 +1009,7 @@ def refresh_single_m3u_account(account_id): # Optionally remove completed task from the group to prevent processing it again result.remove(async_result) else: - logger.debug(f"Task is still running.") + logger.trace(f"Task is still running.") # Ensure all database transactions are committed before cleanup logger.info(f"All {total_batches} tasks completed, ensuring DB transactions are committed before cleanup") diff --git a/dispatcharr/celery.py b/dispatcharr/celery.py index 2fe9e6ec..a0ff2168 100644 --- a/dispatcharr/celery.py +++ b/dispatcharr/celery.py @@ -55,7 +55,7 @@ def setup_celery_logging(**kwargs): print(f"Celery configuring loggers with level: {log_level}") # Get the specific loggers that output potentially noisy messages - for logger_name in ['celery.app.trace', 'celery.beat', 'celery.worker.strategy', 'celery.beat.Scheduler']: + for logger_name in ['celery.app.trace', 'celery.beat', 'celery.worker.strategy', 'celery.beat.Scheduler', 'celery.pool']: logger = logging.getLogger(logger_name) # Remove any existing filters first (in case this runs multiple times) @@ -63,9 +63,8 @@ def setup_celery_logging(**kwargs): if hasattr(filter, '__class__') and filter.__class__.__name__ == 'SuppressFilter': logger.removeFilter(filter) - # For INFO level - add a filter to hide repetitive messages - # For DEBUG/TRACE level - don't filter (show everything) - if log_level == 'INFO': + # Add filtering for both INFO and DEBUG levels - only TRACE will show full logging + if log_level not in ['TRACE']: # Add a custom filter to completely filter out the repetitive messages class SuppressFilter(logging.Filter): def filter(self, record): @@ -73,7 +72,8 @@ def setup_celery_logging(**kwargs): if ( "succeeded in" in getattr(record, 'msg', '') or "Scheduler: Sending due task" in getattr(record, 'msg', '') or - "received" in getattr(record, 'msg', '') + "received" in getattr(record, 'msg', '') or + (logger_name == 'celery.pool' and "Apply" in getattr(record, 'msg', '')) ): return False # Don't log these messages at all return True # Log all other messages