From efb4e376eb92ca330432c4e348fb6479834b7b48 Mon Sep 17 00:00:00 2001
From: myarjunar <myarjunar@gmail.com>
Date: Fri, 1 Jun 2018 01:48:23 +0700
Subject: [PATCH 1/2] add kartoza sentry configurations

---
 geonode/settings.py | 97 +++++++++++++++++++++++++++++++++++++++++++++
 requirements.txt    |  1 +
 2 files changed, 98 insertions(+)

diff --git a/geonode/settings.py b/geonode/settings.py
index c153773ce13..69d2c2ea5cc 100644
--- a/geonode/settings.py
+++ b/geonode/settings.py
@@ -330,6 +330,7 @@
 
 INSTALLED_APPS = (
 
+    'raven.contrib.django.raven_compat',  # enable Raven plugin
     'modeltranslation',
 
     # Boostrap admin theme
@@ -1339,3 +1340,99 @@
 GEOTIFF_IO_BASE_URL = os.getenv(
     'GEOTIFF_IO_BASE_URL', 'https://app.geotiff.io'
 )
+
+# Sentry Logging
+
+LOGGING_MAIL_ADMINS = ast.literal_eval(
+    os.environ.get('LOGGING_MAIL_ADMINS', 'False'))
+LOGGING_SENTRY = ast.literal_eval(
+    os.environ.get('LOGGING_SENTRY', 'False'))
+
+LOGGING_DEFAULT_HANDLER = os.environ.get('LOGGING_DEFAULT_HANDLER', 'console')
+LOGGING_DEFAULT_LOG_LEVEL = os.environ.get(
+    'LOGGING_DEFAULT_LOG_LEVEL', 'ERROR')
+
+default_handlers = [LOGGING_DEFAULT_HANDLER]
+
+if LOGGING_MAIL_ADMINS:
+    mail_admins_handler = 'mail_admins'
+else:
+    mail_admins_handler = LOGGING_DEFAULT_HANDLER
+
+if LOGGING_SENTRY:
+    sentry_handler = 'sentry'
+    default_handlers.append('sentry')
+else:
+    sentry_handler = LOGGING_DEFAULT_HANDLER
+
+if 'raven.contrib.django.raven_compat' in INSTALLED_APPS:
+    print '*********** Setting up sentry logging ************'
+    RAVEN_CONFIG = {
+        'dsn': 'http://4425a43d1ae2490bba0b7b397025fd49:'
+               'f60de041c1814ff79f3e510c0731cb3e@sentry.kartoza.com/17',
+    }
+
+    # MIDDLEWARE_CLASSES = (
+    #     'raven.contrib.django.middleware.SentryResponseErrorIdMiddleware',
+    #     'raven.contrib.django.middleware.SentryLogMiddleware',
+    # ) + MIDDLEWARE_CLASSES
+
+    #
+    # Sentry settings - logs exceptions to a database
+    LOGGING = {
+        # internal dictConfig version - DON'T CHANGE
+        'version': 1,
+        'disable_existing_loggers': False,
+        # default root logger
+        'root': {
+            'level': LOGGING_DEFAULT_LOG_LEVEL,
+            'handlers': default_handlers,
+        },
+        'handlers': {
+            # send email to mail_admins, if DEBUG=False
+            'mail_admins': {
+                'level': 'ERROR',
+                'class': 'django.utils.log.AdminEmailHandler'
+            },
+            # sentry logger
+            'sentry': {
+                'level': 'WARNING',
+                'class': (
+                    'raven.contrib.django.raven_compat.'
+                    'handlers.SentryHandler'),
+            },
+            # file logger
+            'logfile': {
+                'class': 'logging.FileHandler',
+                'filename': '/var/log/django.log',
+                'level': 'DEBUG'
+            },
+            # console output
+            'console': {
+                'class': 'logging.StreamHandler',
+                'level': 'DEBUG',
+            },
+        },
+        'loggers': {
+            'django.db.backends': {
+                'level': 'ERROR',
+                'handlers': [sentry_handler],
+                'propagate': True
+            },
+            'raven': {
+                'level': 'ERROR',
+                'handlers': [mail_admins_handler],
+                'propagate': False
+            },
+            'sentry.errors': {
+                'level': 'ERROR',
+                'handlers': [mail_admins_handler],
+                'propagate': False
+            },
+            'django.request': {
+                'handlers': [mail_admins_handler],
+                'level': 'ERROR',
+                'propagate': True
+            }
+        }
+    }
diff --git a/requirements.txt b/requirements.txt
index f0e7bc850ff..51a039aa0da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -142,6 +142,7 @@ python-mimeparse==1.6.0
 python-openid==2.2.5
 pytz==2018.3
 PyYAML==3.12
+raven==5.29.0
 redis==2.10.5
 regex==2016.7.21
 requests==2.18.4

From 629ea68d4f0c7dc5c9798efcbb28e5c670761808 Mon Sep 17 00:00:00 2001
From: myarjunar <myarjunar@gmail.com>
Date: Wed, 6 Jun 2018 14:22:07 +0700
Subject: [PATCH 2/2] add master-qgis_server branch for triggering travis build

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4c66b16c1bb..18e8f1bc26f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ env:
 
 branches:
   only:
+    - master-qgis_server
     - master
     - 2.9.x
     - 2.7.x