oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev4057, Log invalid result from websocket

Browse source
This commit is contained in:
shortcutme 2019-04-11 16:33:36 +02:00
parent a7632889a2
commit 9f5600b7f7
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.7.0" self.version = "0.7.0"
self.rev = 4056 self.rev = 4057
self.argv = argv self.argv = argv
self.action = None self.action = None
self.pending_changes = {} self.pending_changes = {}

7
src/main.py
View file

@ -330,7 +330,12 @@ class Actions(object):
ws = self.getWebsocket(site) ws = self.getWebsocket(site)
ws.send(json.dumps({"cmd": cmd, "params": parameters, "id": 1})) ws.send(json.dumps({"cmd": cmd, "params": parameters, "id": 1}))
res = json.loads(ws.recv()) res_raw = ws.recv()
try:
res = json.loads(res_raw)
except Exception as err:
return {"error": "Invalid result: %s" % err, "res_raw": res_raw}
if "result" in res: if "result" in res:
return res["result"] return res["result"]
else: else: