From 5bf202189d9e78e6bf6ed3870bb7b61482ffe3e6 Mon Sep 17 00:00:00 2001 From: Brian Martin Date: Tue, 21 May 2019 10:13:21 -0400 Subject: [PATCH] Return 500 errors for command timeout Bumper was returning an invalid errno when a command for MQTT would timeout. Change to return a 500 errno with a debug message. Closes #31 --- bumper/confserver.py | 2 +- bumper/mqttserver.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bumper/confserver.py b/bumper/confserver.py index beb25da..7af5fa6 100644 --- a/bumper/confserver.py +++ b/bumper/confserver.py @@ -1164,7 +1164,7 @@ class ConfServer: json_body["toId"] ) ) - body = {"id": randomid, "errno": bumper.ERR_COMMON, "ret": "fail"} + body = {"id": randomid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} return web.json_response(body) else: diff --git a/bumper/mqttserver.py b/bumper/mqttserver.py index 115e71d..3749f0c 100644 --- a/bumper/mqttserver.py +++ b/bumper/mqttserver.py @@ -142,11 +142,13 @@ class MQTTHelperBot: self.command_responses.set(cresp) return resp - return {"id": requestid, "errno": "timeout", "ret": "fail"} + return {"id": requestid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} except asyncio.CancelledError as e: helperbotlog.debug("wait_for_resp cancelled by asyncio") + return {"id": requestid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} except Exception as e: helperbotlog.exception("{}".format(e)) + return {"id": requestid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} async def send_command(self, cmdjson, requestid): try: -- 2.39.5