UiWebsocket handleRequest takes parsed request intead of raw message

This commit is contained in:
shortcutme 2017-12-15 12:11:27 +01:00
parent ca42740e1b
commit 8a331e7400
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE

View file

@ -76,7 +76,8 @@ class UiWebsocket(object):
if message: if message:
try: try:
self.handleRequest(message) req = json.loads(message)
self.handleRequest(req)
except Exception, err: except Exception, err:
if config.debug: # Allow websocket errors to appear on /Debug if config.debug: # Allow websocket errors to appear on /Debug
sys.modules["main"].DebugHook.handleError() sys.modules["main"].DebugHook.handleError()
@ -226,8 +227,7 @@ class UiWebsocket(object):
return wrapper return wrapper
# Handle incoming messages # Handle incoming messages
def handleRequest(self, data): def handleRequest(self, req):
req = json.loads(data)
cmd = req.get("cmd") cmd = req.get("cmd")
params = req.get("params") params = req.get("params")