Merge branch 'master' into 'feature/vuejs'

# Conflicts:
#   CHANGELOG.rst

CHANGELOG.rst

@@ -14,6 +14,11 @@ Added
 
 * Introduce GraphQL API
 
+Fixed
+~~~~~
+
+* Celery's logging did not honour Django's logging level
+
 `2.10.1`_ - 2022-07-24
 ----------------------
 

aleksis/core/celery.py

+import logging
 import os
 from traceback import format_exception
 
 from django.conf import settings
 
 from celery import Celery
-from celery.signals import task_failure
+from celery.signals import setup_logging, task_failure
 
 from .util.core_helpers import get_site_preferences
 from .util.email import send_email
@@ -35,3 +36,9 @@ def task_failure_notifier(
             "traceback": "".join(format_exception(type(exception), exception, traceback)),
         },
     )
+
+
+@setup_logging.connect
+def on_setup_logging(*args, **kwargs):
+    """Load Django's logging configuration when running inside Celery."""
+    logging.config.dictConfig(settings.LOGGING)

aleksis/core/settings.py

@@ -943,6 +943,12 @@ if not _settings.get("logging.disallowed_host", False):
         "handlers": ["null"],
         "propagate": False,
     }
+# Configure logging explicitly for Celery
+LOGGING["loggers"]["celery"] = {
+    "handlers": ["console"],
+    "level": _settings.get("logging.level", "WARNING"),
+    "propagate": False,
+}
 
 # Rules and permissions