From cf9c645cc545637dd25fe0123498fd221749925c Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sun, 22 Oct 2017 22:18:11 +1300
Subject: [PATCH] Removing sentry until better long-term logger solution found

---
 mopidy_iris/core.py     | 11 -----------
 mopidy_iris/handlers.py |  8 ++++++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mopidy_iris/core.py b/mopidy_iris/core.py
index 96440d28..8577fa56 100755
--- a/mopidy_iris/core.py
+++ b/mopidy_iris/core.py
@@ -93,7 +93,6 @@ class IrisCore(object):
         try:
             self.connections[connection_id]['connection'].write_message( json_encode(data) )
         except:
-            self.raven_client.captureException()
             logger.error('Failed to send message to '+ connection_id)
 
 
@@ -174,7 +173,6 @@ class IrisCore(object):
                     }
                 )
             except:
-                self.raven_client.captureException()
                 logger.error('Failed to close connection to '+ connection_id)           
 
     def set_username(self, *args, **kwargs):
@@ -201,7 +199,6 @@ class IrisCore(object):
 
         else:
             error = 'Connection "'+data['connection_id']+'" not found'
-            self.raven_client.captureMessage(error)
             logger.error(error)
 
             error = {
@@ -228,7 +225,6 @@ class IrisCore(object):
 
         else:
             error = 'Connection "'+data['connection_id']+'" not found'
-            self.raven_client.captureMessage(error)
             logger.error(error)
 
             error = {
@@ -287,7 +283,6 @@ class IrisCore(object):
             upgrade_available = ( upgrade_available == 1 )
 
         except urllib2.HTTPError as e:
-            self.raven_client.captureException(e)
             latest_version = '0.0.0'
             upgrade_available = False
         
@@ -318,7 +313,6 @@ class IrisCore(object):
                 return response
 
         except subprocess.CalledProcessError as e:
-            self.raven_client.captureException(e)
             error = {
                 'message': "Could not start upgrade"
             }
@@ -454,7 +448,6 @@ class IrisCore(object):
             token = token['access_token']
         except:
             error = 'IrisFrontend: access_token missing or invalid'
-            self.raven_client.captureMessage(error)
             logger.error(error)
             return False
             
@@ -478,7 +471,6 @@ class IrisCore(object):
             return uris
 
         except:
-            self.raven_client.captureException()
             logger.error('IrisFrontend: Failed to fetch Spotify recommendations')
             return False
 
@@ -632,7 +624,6 @@ class IrisCore(object):
                 return response
 
         except urllib2.HTTPError as e:
-            self.raven_client.captureException()
             error = json.loads(e.read())
             error = {'message': 'Could not refresh token: '+error['error_description']}
 
@@ -657,7 +648,6 @@ class IrisCore(object):
         try:
             data = kwargs.get('data', {})
         except:
-            self.raven_client.captureException()
             callback(False, {
                 'message': 'Malformed data',
                 'source': 'proxy_request'
@@ -666,7 +656,6 @@ class IrisCore(object):
 
         # Our request includes data, so make sure we POST the data
         if 'url' not in data:
-            self.raven_client.captureException()
             callback(False, {
                 'message': 'Malformed data (missing URL)',
                 'source': 'proxy_request',
diff --git a/mopidy_iris/handlers.py b/mopidy_iris/handlers.py
index 8584b436..03753add 100755
--- a/mopidy_iris/handlers.py
+++ b/mopidy_iris/handlers.py
@@ -107,6 +107,10 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
         error = kwargs.get('error', None)
         request_id = kwargs.get('request_id', False)
 
+        print response
+        print error
+        print '-------'
+
         # We've been given an error
         if error:
             data = error
@@ -114,7 +118,7 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
             data['request_id'] = request_id
 
             # Log error with Sentry
-            mem.iris.raven_client.captureMessage(error.message)
+            #mem.iris.raven_client.captureMessage(data.message)
 
         # We've been handed an AsyncHTTPClient callback. This is the case
         # when our request calls subsequent external requests (eg Spotify, Genius)
@@ -198,7 +202,7 @@ class HttpHandler(tornado.web.RequestHandler):
             data['status'] = 0
 
             # Log error with Sentry
-            mem.iris.raven_client.captureMessage(data.message)
+            #mem.iris.raven_client.captureMessage(data.message)
 
 
         # We've been handed an AsyncHTTPClient callback. This is the case