add scan retries to getting data
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
from API.bmminer import BMMinerAPI
|
from API.bmminer import BMMinerAPI
|
||||||
from miners import BaseMiner
|
from miners import BaseMiner
|
||||||
import logging
|
import logging
|
||||||
|
from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
|
||||||
|
|
||||||
|
|
||||||
class BMMiner(BaseMiner):
|
class BMMiner(BaseMiner):
|
||||||
@@ -143,7 +144,12 @@ class BMMiner(BaseMiner):
|
|||||||
if hostname:
|
if hostname:
|
||||||
data["Hostname"] = hostname
|
data["Hostname"] = hostname
|
||||||
|
|
||||||
miner_data = await self.api.multicommand("summary", "pools", "stats")
|
miner_data = None
|
||||||
|
for i in range(DATA_RETRIES):
|
||||||
|
miner_data = await self.api.multicommand("summary", "pools", "stats")
|
||||||
|
if miner_data:
|
||||||
|
break
|
||||||
|
|
||||||
if not miner_data:
|
if not miner_data:
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ from API.bosminer import BOSMinerAPI
|
|||||||
import toml
|
import toml
|
||||||
from config.bos import bos_config_convert, general_config_convert_bos
|
from config.bos import bos_config_convert, general_config_convert_bos
|
||||||
import logging
|
import logging
|
||||||
|
from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
|
||||||
|
|
||||||
|
|
||||||
class BOSMiner(BaseMiner):
|
class BOSMiner(BaseMiner):
|
||||||
@@ -256,9 +257,13 @@ class BOSMiner(BaseMiner):
|
|||||||
if hostname:
|
if hostname:
|
||||||
data["Hostname"] = hostname
|
data["Hostname"] = hostname
|
||||||
|
|
||||||
miner_data = await self.api.multicommand(
|
miner_data = None
|
||||||
"summary", "temps", "tunerstatus", "pools"
|
for i in range(DATA_RETRIES):
|
||||||
)
|
miner_data = await self.api.multicommand(
|
||||||
|
"summary", "temps", "tunerstatus", "pools"
|
||||||
|
)
|
||||||
|
if miner_data:
|
||||||
|
break
|
||||||
if not miner_data:
|
if not miner_data:
|
||||||
return data
|
return data
|
||||||
summary = miner_data.get("summary")[0]
|
summary = miner_data.get("summary")[0]
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ from API.btminer import BTMinerAPI
|
|||||||
from miners import BaseMiner
|
from miners import BaseMiner
|
||||||
from API import APIError
|
from API import APIError
|
||||||
import logging
|
import logging
|
||||||
|
from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
|
||||||
|
|
||||||
|
|
||||||
class BTMiner(BaseMiner):
|
class BTMiner(BaseMiner):
|
||||||
@@ -98,8 +99,12 @@ class BTMiner(BaseMiner):
|
|||||||
|
|
||||||
if hostname:
|
if hostname:
|
||||||
data["Hostname"] = hostname
|
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
|
||||||
|
|
||||||
miner_data = await self.api.multicommand("summary", "devs", "pools")
|
|
||||||
if not miner_data:
|
if not miner_data:
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from miners import BaseMiner
|
from miners import BaseMiner
|
||||||
from API.cgminer import CGMinerAPI
|
from API.cgminer import CGMinerAPI
|
||||||
from API import APIError
|
from API import APIError
|
||||||
|
from settings import MINER_FACTORY_GET_VERSION_RETRIES as DATA_RETRIES
|
||||||
|
|
||||||
|
|
||||||
class CGMiner(BaseMiner):
|
class CGMiner(BaseMiner):
|
||||||
@@ -117,8 +118,12 @@ class CGMiner(BaseMiner):
|
|||||||
|
|
||||||
if hostname:
|
if hostname:
|
||||||
data["Hostname"] = hostname
|
data["Hostname"] = hostname
|
||||||
|
miner_data = None
|
||||||
|
for i in range(DATA_RETRIES):
|
||||||
|
miner_data = await self.api.multicommand("summary", "pools", "stats")
|
||||||
|
if miner_data:
|
||||||
|
break
|
||||||
|
|
||||||
miner_data = await self.api.multicommand("summary", "pools", "stats")
|
|
||||||
if not miner_data:
|
if not miner_data:
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user