andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http: Formatting

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-05-14 23:59:20 +02:00
parent a4a417eb37
commit fabb357dc8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mopidy/http/handlers.py
View File

@ -6,7 +6,8 @@ import tornado.escape
import tornado.web import tornado.web
import tornado.websocket import tornado.websocket
from mopidy import __version__, core, models import mopidy
from mopidy import core, models
from mopidy.utils import jsonrpc from mopidy.utils import jsonrpc
@ -61,17 +62,16 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
self.request.remote_ip) self.request.remote_ip)
def on_message(self, message): def on_message(self, message):
if not message: if not message:
return return
logger.debug( logger.debug(
'Received WebSocket message from %s: %r', 'Received WebSocket message from %s: %r',
self.request.remote_ip, message) self.request.remote_ip, message)
try: try:
response = self.jsonrpc.handle_json( response = self.jsonrpc.handle_json(
tornado.escape.native_str(message) tornado.escape.native_str(message))
)
if response and self.write_message(response): if response and self.write_message(response):
logger.debug( logger.debug(
'Sent WebSocket message to %s: %r', 'Sent WebSocket message to %s: %r',
@ -91,18 +91,20 @@ class JsonRpcHandler(tornado.web.RequestHandler):
def post(self): def post(self):
data = self.request.body data = self.request.body
if not data: if not data:
return return
logger.debug('Received RPC message from %s: %r',
self.request.remote_ip, data) logger.debug(
'Received RPC message from %s: %r', self.request.remote_ip, data)
try: try:
self.set_extra_headers() self.set_extra_headers()
response = self.jsonrpc.handle_json( response = self.jsonrpc.handle_json(
tornado.escape.native_str(data)) tornado.escape.native_str(data))
if response and self.write(response): if response and self.write(response):
logger.debug('Sent RPC message to %s: %r', logger.debug(
self.request.remote_ip, response) 'Sent RPC message to %s: %r',
self.request.remote_ip, response)
except Exception as e: except Exception as e:
logger.error('HTTP JSON-RPC request error:', e) logger.error('HTTP JSON-RPC request error:', e)
self.write_error(500) self.write_error(500)
@ -110,6 +112,6 @@ class JsonRpcHandler(tornado.web.RequestHandler):
def set_extra_headers(self): def set_extra_headers(self):
self.set_header('Accept', 'application/json') self.set_header('Accept', 'application/json')
self.set_header('Cache-Control', 'no-cache') self.set_header('Cache-Control', 'no-cache')
self.set_header('X-Mopidy-Version', __version__.encode( self.set_header(
'utf-8')) 'X-Mopidy-Version', mopidy.__version__.encode('utf-8'))
self.set_header('Content-Type', 'application/json; utf-8') self.set_header('Content-Type', 'application/json; utf-8')