secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
James Barnsley
2018-06-16 12:40:18 +12:00
parent b9dd17c953 4d64980900
commit 2837486aef
6 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.md
View File

@ -1 +1 @@
3.21.1 3.21.2

9
mopidy_iris/__init__.py
View File

@ -10,10 +10,9 @@ from mopidy import config, ext
from frontend import IrisFrontend from frontend import IrisFrontend
from handlers import WebsocketHandler, HttpHandler from handlers import WebsocketHandler, HttpHandler
from core import IrisCore from core import IrisCore
from raven import Client
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
__version__ = '3.21.1' __version__ = '3.21.2'
## ##
# Core extension class # Core extension class
@ -54,12 +53,6 @@ class Extension( ext.Extension ):
mem.iris = IrisCore() mem.iris = IrisCore()
mem.iris.version = self.version mem.iris.version = self.version
# Connect to our Ravent Sentry error tracker
mem.iris.raven_client = Client(
dsn='https://023e3bf7721b48f29948545fc36a4621:ba30d29174ef4778ac4e141d445607a2@sentry.io/219026',
release=self.version
)
# Add our frontend # Add our frontend
registry.add('frontend', IrisFrontend) registry.add('frontend', IrisFrontend)

6
mopidy_iris/handlers.py
View File

@ -122,9 +122,6 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
error['id'] = id error['id'] = id
request_response['error'] = error request_response['error'] = error
# Log error with Sentry
#mem.iris.raven_client.captureMessage(data.message)
# We've been handed an AsyncHTTPClient callback. This is the case # We've been handed an AsyncHTTPClient callback. This is the case
# when our request calls subsequent external requests (eg Spotify, Genius) # when our request calls subsequent external requests (eg Spotify, Genius)
elif isinstance(response, tornado.httpclient.HTTPResponse): elif isinstance(response, tornado.httpclient.HTTPResponse):
@ -216,9 +213,6 @@ class HttpHandler(tornado.web.RequestHandler):
request_response['error'] = error request_response['error'] = error
self.set_status(400) self.set_status(400)
# Log error with Sentry
#mem.iris.raven_client.captureMessage(data.message)
# We've been handed an AsyncHTTPClient callback. This is the case # We've been handed an AsyncHTTPClient callback. This is the case
# when our request calls subsequent external requests (eg Spotify, Genius). # when our request calls subsequent external requests (eg Spotify, Genius).

4
mopidy_iris/static/index.html
View File

@ -77,8 +77,8 @@
// Release details // Release details
// These are automatically injected to built HTML // These are automatically injected to built HTML
var build = "1529095476"; var build = "1529109454";
var version = "3.21.1"; var version = "3.21.2";
// Construct the script tag // Construct the script tag
var js = document.createElement("script"); var js = document.createElement("script");

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mopidy-iris", "name": "mopidy-iris",
"version": "3.21.1", "version": "3.21.2",
"description": "Mopidy HTTP interface", "description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris", "repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>", "author": "James Barnsley <james@barnsley.nz>",

1
setup.py
View File

@ -25,7 +25,6 @@ setup(
'Mopidy >= 2.0', 'Mopidy >= 2.0',
'Mopidy-Local-Images >= 1.0', 'Mopidy-Local-Images >= 1.0',
'ConfigObj >= 5.0.6', 'ConfigObj >= 5.0.6',
'raven >= 6.1.0',
'requests >= 2.0.0', 'requests >= 2.0.0',
'tornado >= 3.2, < 5.0' 'tornado >= 3.2, < 5.0'
], ],