From 6c5970ffc393ffcd907cf3e701271b1f4d8bd816 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 1 Mar 2015 20:46:54 +0100 Subject: [PATCH] http: Make sure to decode exceptions for logging --- mopidy/http/handlers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mopidy/http/handlers.py b/mopidy/http/handlers.py index 561c34b3..a5baf992 100644 --- a/mopidy/http/handlers.py +++ b/mopidy/http/handlers.py @@ -10,7 +10,7 @@ import tornado.websocket import mopidy from mopidy import core, models -from mopidy.utils import jsonrpc +from mopidy.utils import encoding, jsonrpc logger = logging.getLogger(__name__) @@ -81,8 +81,9 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler): try: client.write_message(msg) except Exception as e: + error_msg = encoding.locale_decode(e) logger.debug('Broadcast of WebSocket message to %s failed: %s', - client.request.remote_ip, e) + client.request.remote_ip, error_msg) # TODO: should this do the same cleanup as the on_message code? def initialize(self, core): @@ -121,7 +122,8 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler): 'Sent WebSocket message to %s: %r', self.request.remote_ip, response) except Exception as e: - logger.error('WebSocket request error: %s', e) + error_msg = encoding.locale_decode(e) + logger.error('WebSocket request error: %s', error_msg) if self.ws_connection: # Tornado 3.2+ checks if self.ws_connection is None before # using it, but not older versions.