From f9318ec94cebb4573c2fb85ac888b8f1796c1935 Mon Sep 17 00:00:00 2001
From: Edward L Platt <ed@elplatt.com>
Date: Fri, 2 Sep 2016 19:51:53 -0400
Subject: [PATCH] Replace javascript logging with python logging, close #261.

---
 app.config.sample                 |  3 +++
 app/core/__init__.py              | 21 ++++++++-------------
 app/core/core_templates/base.html |  4 ----
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app.config.sample b/app.config.sample
index 55df10c..7245e5a 100644
--- a/app.config.sample
+++ b/app.config.sample
@@ -16,3 +16,6 @@ num_threads = 0
 
 [analytics]
 google_analytics_id =
+
+[sentry]
+dsn = https://<key>:<secret>@app.getsentry.com/<project>
diff --git a/app/core/__init__.py b/app/core/__init__.py
index 117e1d4..7ac49a0 100644
--- a/app/core/__init__.py
+++ b/app/core/__init__.py
@@ -12,6 +12,10 @@
 
 import os.path
 
+from raven.conf import setup_logging
+from raven.contrib.flask import Sentry
+from raven.handlers.logging import SentryHandler
+
 # Load configuration
 config = ConfigParser.ConfigParser()
 current_dir = os.path.dirname(os.path.abspath(__file__))
@@ -21,27 +25,18 @@
 logger = logging.getLogger(__name__)	# the mediameter logger
 
 # setup logging
+sentry = Sentry(dsn=config.get('sentry', 'dsn'))
+handler = SentryHandler(config.get('sentry', 'dsn'))
+setup_logging(handler)
 logging.basicConfig(level=logging.INFO)
-log_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-log_handler = logging.handlers.RotatingFileHandler(
-	os.path.join(base_dir,'log','mediameter.log'), 'a', 10485760, 10) # 10MB
-log_handler.setFormatter(log_formatter)
-# set up mediacloud logging to the file
 mc_logger = logging.getLogger('mediacloud')
-mc_logger.propagate = False
-mc_logger.addHandler(log_handler)
-# set up requests logging to the file
 requests_logger = logging.getLogger('requests')
-requests_logger.propagate = False
-requests_logger.addHandler(log_handler)
-# set up mediameter logging the same way
-logger.propagate = False
-logger.addHandler(log_handler)
 
 logger.info("---------------------------------------------------------------------------------------")
 
 # Flask app
 flapp = flask.Flask(__name__)
+sentry.init_app(flapp)
 flapp.secret_key = 'put secret key here'
 assets = Environment(flapp)
 
diff --git a/app/core/core_templates/base.html b/app/core/core_templates/base.html
index a96d07e..9454e4f 100644
--- a/app/core/core_templates/base.html
+++ b/app/core/core_templates/base.html
@@ -167,10 +167,6 @@ <h3><a href="http://cyber.law.harvard.edu"><img class="img-responsive" src="stat
         {% endassets %}
 
         {% block scripts %}{% endblock %}
-        <script src="https://cdn.ravenjs.com/3.4.1/raven.min.js"></script>
-        <script type="text/javascript">
-            Raven.config('https://793ffceba9304a6cad3d381c4d0db51b@app.getsentry.com/91699').install();
-        </script>
         <script type="text/javascript">$(function(){ App.Controller.initialize(); });</script>
         {% if google_analytics_id is defined %}
             <script>