fixed a bug with suspended whatsminers

miners/_backends/bmminer.py

@@ -7,6 +7,7 @@ from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
 class BMMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
+        self.ip = ip
         self.api = BMMinerAPI(ip)
         self.api_type = "BMMiner"
         self.uname = "root"

miners/_backends/bosminer.py

@@ -10,6 +10,7 @@ import asyncssh
 class BOSMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
+        self.ip = ip
         self.api = BOSMinerAPI(ip)
         self.api_type = "BOSMiner"
         self.uname = "root"
@@ -379,7 +380,6 @@ class BOSMinerOld(BaseMiner):
         self.uname = "root"
         self.pwd = "admin"
 
-
     async def send_ssh_command(self, cmd: str) -> str or None:
         """Send a command to the miner over ssh.
 
@@ -406,9 +406,6 @@ class BOSMinerOld(BaseMiner):
         # return the result, either command output or None
         return str(result)
 
-
     async def update_to_plus(self):
         result = await self.send_ssh_command("opkg update && opkg install bos_plus")
         return result
-
-

miners/_backends/btminer.py

@@ -8,6 +8,7 @@ from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
 class BTMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
+        self.ip = ip
         self.api = BTMinerAPI(ip)
         self.api_type = "BTMiner"
 
@@ -93,8 +94,15 @@ class BTMiner(BaseMiner):
             "Pool 2 User": "",
         }
 
-        model = await self.get_model()
-        hostname = await self.get_hostname()
+        try:
+            model = await self.get_model()
+            hostname = await self.get_hostname()
+        except APIError:
+            logging.warning(f"Failed to get hostname and model: {self}")
+            model = None
+            data["Model"] = "Whatsminer"
+            hostname = None
+            data["Hostname"] = "Whatsminer"
 
         if model:
             data["Model"] = model
@@ -103,9 +111,12 @@ class BTMiner(BaseMiner):
             data["Hostname"] = hostname
         miner_data = None
         for i in range(DATA_RETRIES):
-            miner_data = await self.api.multicommand("summary", "devs", "pools")
-            if miner_data:
-                break
+            try:
+                miner_data = await self.api.multicommand("summary", "devs", "pools")
+                if miner_data:
+                    break
+            except APIError:
+                pass
 
         if not miner_data:
             return data

miners/_backends/cgminer.py

@@ -8,6 +8,7 @@ import logging
 class CGMiner(BaseMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
+        self.ip = ip
         self.api = CGMinerAPI(ip)
         self.api_type = "CGMiner"
         self.uname = "root"

miners/_backends/hiveon.py

@@ -4,6 +4,7 @@ from miners._backends import BMMiner
 class Hiveon(BMMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
+        self.ip = ip
         self.api_type = "Hiveon"
         self.uname = "root"
         self.pwd = "admin"