mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-12 03:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WebUI] Use error logging and add exception message detail

Browse source
This commit is contained in:
Calum Lind 2017-03-01 14:31:51 +00:00
commit 966678196e
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
deluge/ui/web/json_api.py
View file

@ -142,12 +142,15 @@ class JSON(resource.Resource, component.Component):
request.json = json.loads(request.json) request.json = json.loads(request.json)
except (ValueError, TypeError): except (ValueError, TypeError):
raise JSONException('JSON not decodable') raise JSONException('JSON not decodable')
if 'method' not in request.json or 'id' not in request.json or \
'params' not in request.json:
raise JSONException('Invalid JSON request')
method, params = request.json['method'], request.json['params'] try:
method = request.json['method']
params = request.json['params']
request_id = request.json['id'] request_id = request.json['id']
except KeyError as ex:
message = 'Invalid JSON request, missing param %s in %s' % (ex, request.json)
raise JSONException(message)
result = None result = None
error = None error = None
@ -162,7 +165,6 @@ class JSON(resource.Resource, component.Component):
error = {'message': 'Not authenticated', 'code': 1} error = {'message': 'Not authenticated', 'code': 1}
except Exception as ex: except Exception as ex:
log.error('Error calling method `%s`', method) log.error('Error calling method `%s`', method)
log.exception(ex)
error = {'message': '%s: %s' % (ex.__class__.__name__, str(ex)), 'code': 3} error = {'message': '%s: %s' % (ex.__class__.__name__, str(ex)), 'code': 3}
return request_id, result, error return request_id, result, error
@ -178,7 +180,7 @@ class JSON(resource.Resource, component.Component):
""" """
Handles any failures that occurred while making an rpc call. Handles any failures that occurred while making an rpc call.
""" """
log.exception(reason) log.error(reason)
response['error'] = {'message': '%s: %s' % (reason.__class__.__name__, str(reason)), 'code': 4} response['error'] = {'message': '%s: %s' % (reason.__class__.__name__, str(reason)), 'code': 4}
return self._send_response(request, response) return self._send_response(request, response)
@ -207,7 +209,7 @@ class JSON(resource.Resource, component.Component):
""" """
Returns the error in json response. Returns the error in json response.
""" """
log.exception(reason) log.error(reason)
response = {'result': None, 'id': None, response = {'result': None, 'id': None,
'error': {'code': 5, 'error': {'code': 5,
'message': '%s: %s' % (reason.__class__.__name__, str(reason))}} 'message': '%s: %s' % (reason.__class__.__name__, str(reason))}}
@ -686,7 +688,7 @@ class WebApi(JSONComponent):
torrent_info = uicommon.TorrentInfo(filename.strip(), 2) torrent_info = uicommon.TorrentInfo(filename.strip(), 2)
return torrent_info.as_dict('name', 'info_hash', 'files_tree') return torrent_info.as_dict('name', 'info_hash', 'files_tree')
except Exception as ex: except Exception as ex:
log.exception(ex) log.error(ex)
return False return False
@export @export