Reverted changes to celery logging (release hotfix) (#2782)

* Reverted changes to celery logging

* Removed tests for logging changes that were reverted

* Removed remaining test that used reverted changes

Author: joshuastegmaier

concordia/celery.py

@@ -4,7 +4,6 @@
 
 import sentry_sdk
 from celery import Celery
-from celery.signals import setup_logging
 from sentry_sdk.integrations.celery import CeleryIntegration
 
 from concordia.version import get_concordia_version
@@ -28,17 +27,5 @@
 #   should have a `CELERY_` prefix.
 app.config_from_object("django.conf:settings", namespace="CELERY")
 
-
-# Celery won't be default use the logging settings
-# This configures Celery's logging to use our settings
-@setup_logging.connect
-def configure_logging(**kwargs):
-    import logging.config
-
-    from django.conf import settings
-
-    logging.config.dictConfig(settings.LOGGING)
-
-
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()

concordia/settings_template.py

@@ -253,22 +253,12 @@
             "datefmt": "%Y-%m-%dT%H:%M:%S",
             "style": "{",
         },
-        "celery": {
-            "format": "[%(asctime)s: %(levelname)s/%(processName)s]%(task_id)s "
-            "%(name)s: %(message)s",
-            "datefmt": "%Y-%m-%d %H:%M:%S",
-        },
         "short": {
             "format": "[{levelname} {name}] {message}",
             "datefmt": "%Y-%m-%dT%H:%M:%S",
             "style": "{",
         },
     },
-    "filters": {
-        "celery_task_id": {
-            "()": "importer.logging.CeleryTaskIDFilter",
-        },
-    },
     "handlers": {
         "stream": {
             "class": "logging.StreamHandler",
@@ -289,9 +279,8 @@
             "level": "INFO",
             "class": "logging.handlers.RotatingFileHandler",
             "filename": f"{SITE_ROOT_DIR}/logs/celery.log",
-            "formatter": "celery",
+            "formatter": "long",
             "maxBytes": 1024 * 1024 * 100,  # 100 mb
-            "filters": ["celery_task_id"],
         },
     },
     "loggers": {

importer/celery.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 from celery import Celery
-from celery.signals import setup_logging
 
 app = Celery("importer")
 
@@ -11,17 +10,5 @@
 #   should have a `CELERY_` prefix.
 app.config_from_object("django.conf:settings", namespace="CELERY")
 
-
-# Celery won't be default use the logging settings
-# This configures Celery's logging to use our settings
-@setup_logging.connect
-def configure_logging(**kwargs):
-    import logging.config
-
-    from django.conf import settings
-
-    logging.config.dictConfig(settings.LOGGING)
-
-
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()