This commit is contained in:
James Barnsley
2020-02-06 10:14:27 +13:00
parent 4ae58cdf9e
commit d07a59a1e7
2 changed files with 24 additions and 11 deletions

View File

@ -886,7 +886,7 @@ class IrisCore(pykka.ThreadingActor):
error = {
"message": "Command failed",
"description": "Could not find command by ID "
+ '"' + str(data["id"]) + '"',
+ '"' + str(data["id"]) + '"',
}
else:
command = self.commands[str(data["id"])]

View File

@ -101,10 +101,13 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
),
)
else:
getattr(iris, message["method"])(
getattr(
iris,
message["method"])(
ioloop=self.ioloop,
data=params,
callback=lambda response, error=False: self.handle_result(
callback=lambda response,
error=False: self.handle_result(
id=id,
method=message["method"],
response=response,
@ -211,12 +214,17 @@ class HttpHandler(tornado.web.RequestHandler):
),
)
else:
getattr(iris, slug)(
getattr(
iris,
slug)(
ioloop=self.ioloop,
request=self,
callback=lambda response, error=False: self.handle_result(
id=id, method=slug, response=response, error=error
),
callback=lambda response,
error=False: self.handle_result(
id=id,
method=slug,
response=response,
error=error),
)
except Exception as e:
logger.error(str(e))
@ -256,12 +264,17 @@ class HttpHandler(tornado.web.RequestHandler):
),
)
else:
getattr(iris, slug)(
getattr(
iris,
slug)(
data=params,
request=self.request,
callback=lambda response=False, error=False: self.handle_result(
id=id, method=slug, response=response, error=error
),
callback=lambda response=False,
error=False: self.handle_result(
id=id,
method=slug,
response=response,
error=error),
)
except tornado.web.HTTPError: