From e3fcb4b5430061043690cda2e454839a2a12b2b4 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolai.kristiansen@convertelligence.no>
Date: Sat, 17 Mar 2018 13:30:29 +0100
Subject: [PATCH] Remove deprecated middleware, add sentry

---
 dpdapisite/settings.py | 50 ++++++++++++++++++++++++++++++++++++++----
 dpdapisite/wsgi.py     |  5 ++++-
 requirements.txt       |  3 ++-
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/dpdapisite/settings.py b/dpdapisite/settings.py
index 9ee7dc1..ddfdef5 100644
--- a/dpdapisite/settings.py
+++ b/dpdapisite/settings.py
@@ -55,12 +55,13 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-)
-
-INSTALLED_APPS += (
+    'raven.contrib.django.raven_compat',
     'django_extensions',
     'rest_framework',
     'django_filters',
+)
+
+INSTALLED_APPS += (
     'dpdapi',
 )
 
@@ -69,7 +70,6 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 )
@@ -109,6 +109,48 @@ REST_FRAMEWORK = {
     )
 }
 
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'root': {
+        'level': 'INFO',
+        'handlers': ['console', 'sentry'],
+    },
+    'formatters': {
+        'verbose': {
+            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+        },
+    },
+    'handlers': {
+        'sentry': {
+            'level': 'WARNING',
+            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
+        },
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'formatter': 'verbose'
+        }
+    },
+    'loggers': {
+        'django.db.backends': {
+            'level': 'ERROR',
+            'handlers': ['console'],
+            'propagate': False,
+        },
+        'raven': {
+            'level': 'WARNING',
+            'handlers': ['console'],
+            'propagate': False,
+        },
+        'sentry.errors': {
+            'level': 'WARNING',
+            'handlers': ['console'],
+            'propagate': False,
+        },
+    },
+}
+
 try:
     from .local_settings import *
 except ImportError:
diff --git a/dpdapisite/wsgi.py b/dpdapisite/wsgi.py
index 34db734..e2d5208 100644
--- a/dpdapisite/wsgi.py
+++ b/dpdapisite/wsgi.py
@@ -8,7 +8,10 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 """
 
 import os
+from django.core.wsgi import get_wsgi_application
+from raven.contrib.django.middleware.wsgi import Sentry
+
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dpdapisite.settings")
 
-from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()
+application = Sentry(application)
diff --git a/requirements.txt b/requirements.txt
index 76e23e3..e288959 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,9 @@
 Django==2.0.3
+Fabric3==1.14.post1
 django-extensions==2.0.6
 django-filter==1.1.0
 djangorestframework==3.7.7
-Fabric3==1.14.post1
 gunicorn==19.7.1
 mysqlclient==1.3.12
 passlib==1.7.1
+raven==6.6.0