From a9cdefcd43a42837bcc0490defcabb56b07b2113 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Mon, 18 Apr 2022 12:29:55 -0600 Subject: [PATCH] finished adding timer --- tools/web_testbench/_miners.py | 10 ++++++---- tools/web_testbench/templates/index.html | 17 ++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/web_testbench/_miners.py b/tools/web_testbench/_miners.py index c78a0e97..fca51e26 100644 --- a/tools/web_testbench/_miners.py +++ b/tools/web_testbench/_miners.py @@ -37,7 +37,7 @@ class TestbenchMiner: def get_online_time(self): online_time = "0:00:00" 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 async def add_to_output(self, message): @@ -60,13 +60,13 @@ class TestbenchMiner: await asyncio.sleep(1) 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() await ConnectionManager().broadcast_json( {"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() miner = await MinerFactory().get_miner(self.host) await self.add_to_output("Found miner: " + str(miner)) @@ -258,9 +258,11 @@ class TestbenchMiner: except: self.state = START await self.add_to_output("Miner disconnected, waiting for new miner.") + self.start_time = None return self.state = START await self.add_to_output("Miner disconnected, waiting for new miner.") + self.start_time = None async def install_loop(self): self.latest_version = sorted(await get_local_versions(), reverse=True)[0] diff --git a/tools/web_testbench/templates/index.html b/tools/web_testbench/templates/index.html index 0cbe10df..b53144cc 100644 --- a/tools/web_testbench/templates/index.html +++ b/tools/web_testbench/templates/index.html @@ -92,16 +92,17 @@ ws.onmessage = function(event) { if (data.hasOwnProperty("online")) { timer = document.getElementById(data["IP"] + "-timer") if (data["online"] == "0:00:00") { - if (timer.className.contains("btn-success")) { - timer.className.remove("btn-success") - timer.className += ("btn-secondary") + if (timer.classList.contains("btn-success")) { + timer.classList.remove("btn-success") + timer.className += " btn-secondary" } } else { - if (timer.className.contains("btn-secondary")) { - timer.className.remove("btn-secondary") - timer.className += ("btn-success") + if (timer.classList.contains("btn-secondary")) { + timer.classList.remove("btn-secondary") + timer.className += " btn-success" } } + timer.innerHTML = data["online"] }; if (data.hasOwnProperty("miners")) { 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") miner_stdout.hidden = false miner_stdout_text.innerHTML = data["text"] + miner_stdout_text.innerHTML - } else { - console.log(data) - }; + } if (data.hasOwnProperty("Light")) { light_box = document.getElementById(data["IP"] + "-light_container") if (data["Light"] == "show") {