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

finished adding timer

Browse Source
This commit is contained in:
UpstreamData
2022-04-18 12:29:55 -06:00
parent 3b716a044b
commit 4468fe9fbb
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/web_testbench/_miners.py
View File

@@ -37,7 +37,7 @@ class TestbenchMiner:
def get_online_time(self): def get_online_time(self):
online_time = "0:00:00" online_time = "0:00:00"
if self.start_time: if self.start_time:
online_time = str(datetime.datetime.now() - self.start_time) online_time = str(datetime.datetime.now() - self.start_time).split(".")[0]
return online_time return online_time
async def add_to_output(self, message): async def add_to_output(self, message):
@@ -60,13 +60,13 @@ class TestbenchMiner:
await asyncio.sleep(1) await asyncio.sleep(1)
async def install_start(self): async def install_start(self):
if not await ping_miner(self.host, 80):
await self.add_to_output("Waiting for miner connection...")
return
self.start_time = datetime.datetime.now() self.start_time = datetime.datetime.now()
await ConnectionManager().broadcast_json( await ConnectionManager().broadcast_json(
{"IP": str(self.host), "Light": "hide", "online": self.get_online_time()} {"IP": str(self.host), "Light": "hide", "online": self.get_online_time()}
) )
if not await ping_miner(self.host, 80):
await self.add_to_output("Waiting for miner connection...")
return
await self.remove_from_cache() await self.remove_from_cache()
miner = await MinerFactory().get_miner(self.host) miner = await MinerFactory().get_miner(self.host)
await self.add_to_output("Found miner: " + str(miner)) await self.add_to_output("Found miner: " + str(miner))
@@ -258,9 +258,11 @@ class TestbenchMiner:
except: except:
self.state = START self.state = START
await self.add_to_output("Miner disconnected, waiting for new miner.") await self.add_to_output("Miner disconnected, waiting for new miner.")
self.start_time = None
return return
self.state = START self.state = START
await self.add_to_output("Miner disconnected, waiting for new miner.") await self.add_to_output("Miner disconnected, waiting for new miner.")
self.start_time = None
async def install_loop(self): async def install_loop(self):
self.latest_version = sorted(await get_local_versions(), reverse=True)[0] self.latest_version = sorted(await get_local_versions(), reverse=True)[0]

17
tools/web_testbench/templates/index.html
View File

@@ -92,16 +92,17 @@ ws.onmessage = function(event) {
if (data.hasOwnProperty("online")) { if (data.hasOwnProperty("online")) {
timer = document.getElementById(data["IP"] + "-timer") timer = document.getElementById(data["IP"] + "-timer")
if (data["online"] == "0:00:00") { if (data["online"] == "0:00:00") {
if (timer.className.contains("btn-success")) { if (timer.classList.contains("btn-success")) {
timer.className.remove("btn-success") timer.classList.remove("btn-success")
timer.className += ("btn-secondary") timer.className += " btn-secondary"
} }
} else { } else {
if (timer.className.contains("btn-secondary")) { if (timer.classList.contains("btn-secondary")) {
timer.className.remove("btn-secondary") timer.classList.remove("btn-secondary")
timer.className += ("btn-success") timer.className += " btn-success"
} }
} }
timer.innerHTML = data["online"]
}; };
if (data.hasOwnProperty("miners")) { if (data.hasOwnProperty("miners")) {
var container_all = document.getElementById('chart_container'); var container_all = document.getElementById('chart_container');
@@ -401,9 +402,7 @@ ws.onmessage = function(event) {
var miner_stdout_text = document.getElementById(data["IP"] + "-stdout_text") var miner_stdout_text = document.getElementById(data["IP"] + "-stdout_text")
miner_stdout.hidden = false miner_stdout.hidden = false
miner_stdout_text.innerHTML = data["text"] + miner_stdout_text.innerHTML miner_stdout_text.innerHTML = data["text"] + miner_stdout_text.innerHTML
} else { }
console.log(data)
};
if (data.hasOwnProperty("Light")) { if (data.hasOwnProperty("Light")) {
light_box = document.getElementById(data["IP"] + "-light_container") light_box = document.getElementById(data["IP"] + "-light_container")
if (data["Light"] == "show") { if (data["Light"] == "show") {