3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

websockets: explicitly log JSON-RPC errors 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-02-22 08:40:17 -05:00
parent 958a0f3270
commit 979aef2903
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moonraker/websockets.py
View File

@ -135,11 +135,12 @@ class JsonRPC:
try:
result = await method(ws, *args, **kwargs)
except TypeError as e:
return self.build_error(-32603, f"Invalid params:\n{e}", req_id)
return self.build_error(
-32603, f"Invalid params:\n{e}", req_id, True)
except ServerError as e:
return self.build_error(e.status_code, str(e), req_id)
return self.build_error(e.status_code, str(e), req_id, True)
except Exception as e:
return self.build_error(-31000, str(e), req_id)
return self.build_error(-31000, str(e), req_id, True)
if req_id is None:
return None
@ -153,7 +154,12 @@ class JsonRPC:
'id': req_id
}
def build_error(self, code, msg, req_id=None):
def build_error(self, code, msg, req_id=None, is_exc=False):
log_msg = f"JSON-RPC Request Error: {code}\n{msg}"
if is_exc:
logging.exception(log_msg)
else:
logging.info(log_msg)
return {
'jsonrpc': "2.0",
'error': {'code': code, 'message': msg},