From 73ddb785e0de2269f601f66c6398de3f8acfdc45 Mon Sep 17 00:00:00 2001
From: Sonny <sonnyba871@gmail.com>
Date: Mon, 29 Jun 2020 20:42:58 +0200
Subject: [PATCH] Update logging

---
 src/newsreader/conf/base.py       | 20 ++++++++++----------
 src/newsreader/conf/production.py |  7 +++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/newsreader/conf/base.py b/src/newsreader/conf/base.py
index 85a62ba..62008a3 100644
--- a/src/newsreader/conf/base.py
+++ b/src/newsreader/conf/base.py
@@ -103,13 +103,13 @@ CACHES = {
 # https://docs.djangoproject.com/en/2.2/topics/logging/#configuring-logging
 LOGGING = {
     "version": 1,
-    "disable_existing_loggers": True,
+    "disable_existing_loggers": False,
     "filters": {
         "require_debug_false": {"()": "django.utils.log.RequireDebugFalse"},
         "require_debug_true": {"()": "django.utils.log.RequireDebugTrue"},
     },
     "formatters": {
-        "django.server": {
+        "timestamped": {
             "()": "django.utils.log.ServerFormatter",
             "format": "[{server_time}] {message}",
             "style": "{",
@@ -125,12 +125,7 @@ LOGGING = {
             "level": "INFO",
             "filters": ["require_debug_true"],
             "class": "logging.StreamHandler",
-        },
-        "django.server": {
-            "level": "INFO",
-            "filters": ["require_debug_true"],
-            "class": "logging.StreamHandler",
-            "formatter": "django.server",
+            "formatter": "timestamped",
         },
         "mail_admins": {
             "level": "ERROR",
@@ -155,10 +150,15 @@ LOGGING = {
     "loggers": {
         "django": {
             "handlers": ["console", "mail_admins", "syslog_errors"],
-            "level": "INFO",
+            "level": "WARNING",
         },
         "django.server": {
-            "handlers": ["django.server"],
+            "handlers": ["console", "syslog_errors"],
+            "level": "INFO",
+            "propagate": False,
+        },
+        "django.request": {
+            "handlers": ["console", "syslog_errors"],
             "level": "INFO",
             "propagate": False,
         },
diff --git a/src/newsreader/conf/production.py b/src/newsreader/conf/production.py
index 7e883f7..21a8d0f 100644
--- a/src/newsreader/conf/production.py
+++ b/src/newsreader/conf/production.py
@@ -53,11 +53,14 @@ REGISTRATION_OPEN = False
 # Optionally use sentry integration
 try:
     from sentry_sdk import init as sentry_init
-    from sentry_sdk.integrations.django import CeleryIntegration, DjangoIntegration
+    from sentry_sdk import integrations
 
     sentry_init(
         dsn=os.environ.get("SENTRY_DSN"),
-        integrations=[DjangoIntegration(), CeleryIntegration()],
+        integrations=[
+            integrations.django.DjangoIntegration(),
+            integration.celery.CeleryIntegration(),
+        ],
         send_default_pii=False,
     )
 except ImportError: