bug: handle OSError as ConnectionError, and handle Vnish Msg bug because of missing id key.

This commit is contained in:
Upstream Data
2023-11-25 00:05:03 -07:00
parent 1980ff2563
commit 92bbb21c11
2 changed files with 8 additions and 2 deletions

View File

@@ -257,6 +257,12 @@ If you are sure you want to use this command please use API.send_command("{comma
# this is an error
return False, f"{key}: " + data[key][0]["STATUS"][0]["Msg"]
elif "id" not in data.keys():
if isinstance(data["STATUS"], list):
if data["STATUS"][0].get("STATUS", None) in ["S", "I"]:
return True, None
else:
return False, data["STATUS"][0]["Msg"]
if data["STATUS"] not in ["S", "I"]:
return False, data["Msg"]
else:

View File

@@ -194,8 +194,8 @@ async def ping_and_get_miner(
except asyncio.exceptions.TimeoutError:
# ping failed if we time out
continue
except ConnectionRefusedError:
raise
except OSError as e:
raise ConnectionRefusedError from e
except Exception as e:
logging.warning(f"{str(ip)}: Unhandled ping exception: {e}")
return