bug: fix wrong formatting for multiple error handling

This commit is contained in:
Upstream Data
2022-11-13 18:20:15 -07:00
parent 766fc4efed
commit cd5fe09fd9

View File

@@ -279,7 +279,7 @@ class BOSMiner(BaseMiner):
try: try:
self.light = data["data"]["bos"]["faultLight"] self.light = data["data"]["bos"]["faultLight"]
return self.light return self.light
except KeyError or ValueError or TypeError: except (TypeError, KeyError, ValueError):
pass pass
# get light via ssh if that fails (10x slower) # get light via ssh if that fails (10x slower)
@@ -562,7 +562,7 @@ class BOSMiner(BaseMiner):
/ 1000000, / 1000000,
2, 2,
) )
except TypeError or KeyError or ValueError: except (TypeError, KeyError, ValueError):
pass pass
boards = None boards = None
@@ -602,18 +602,18 @@ class BOSMiner(BaseMiner):
) )
try: try:
data.wattage = query_data["bosminer"]["info"]["workSolver"]["power"]["approxConsumptionW"] data.wattage = query_data["bosminer"]["info"]["workSolver"]["power"]["approxConsumptionW"]
except TypeError or KeyError or ValueError: except (TypeError, KeyError, ValueError):
pass pass
try: try:
data.wattage_limit = query_data["bosminer"]["info"]["workSolver"]["power"]["limitW"] data.wattage_limit = query_data["bosminer"]["info"]["workSolver"]["power"]["limitW"]
except TypeError or KeyError or ValueError: except (TypeError, KeyError, ValueError):
pass pass
for n in range(self.fan_count): for n in range(self.fan_count):
try: try:
setattr(data, f"fan_{n + 1}", query_data["bosminer"]["info"]["fans"][n]["rpm"]) setattr(data, f"fan_{n + 1}", query_data["bosminer"]["info"]["fans"][n]["rpm"])
except TypeError or KeyError or ValueError: except (TypeError, KeyError, ValueError):
pass pass
groups = None groups = None