CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: fix missing catching IndexError

Browse Source
This commit is contained in:
Upstream Data
2022-11-13 18:58:05 -07:00
parent 126b0d124c
commit 031d7e2186
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pyasic/miners/_backends/bosminer.py
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 (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
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, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
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, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
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, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
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, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
groups = None groups = None
@@ -624,37 +624,37 @@ class BOSMiner(BaseMiner):
if len(groups) == 1: if len(groups) == 1:
try: try:
data.pool_1_user = groups[0]["pools"][0]["user"] data.pool_1_user = groups[0]["pools"][0]["user"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
try: try:
data.pool_1_url = groups[0]["pools"][0]["url"] data.pool_1_url = groups[0]["pools"][0]["url"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
try: try:
data.pool_2_user = groups[0]["pools"][1]["user"] data.pool_2_user = groups[0]["pools"][1]["user"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
try: try:
data.pool_2_url = groups[0]["pools"][1]["url"] data.pool_2_url = groups[0]["pools"][1]["url"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
data.quota = 0 data.quota = 0
else: else:
try: try:
data.pool_1_user = groups[0]["pools"][0]["user"] data.pool_1_user = groups[0]["pools"][0]["user"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
try: try:
data.pool_1_url = groups[0]["pools"][0]["url"] data.pool_1_url = groups[0]["pools"][0]["url"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
try: try:
data.pool_2_user = groups[1]["pools"][0]["user"] data.pool_2_user = groups[1]["pools"][0]["user"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
try: try:
data.pool_2_url = groups[1]["pools"][0]["url"] data.pool_2_url = groups[1]["pools"][0]["url"]
except (TypeError, KeyError, ValueError): except (TypeError, KeyError, ValueError, IndexError):
pass pass
if groups[0]["strategy"].get("quota"): if groups[0]["strategy"].get("quota"):
data.quota = groups[0]["strategy"]["quota"] + "/" + groups[1]["strategy"]["quota"] data.quota = groups[0]["strategy"]["quota"] + "/" + groups[1]["strategy"]["quota"]