diff --git a/settings/settings.toml b/settings/settings.toml index 81f57ac3..2198aa33 100644 --- a/settings/settings.toml +++ b/settings/settings.toml @@ -1,6 +1,6 @@ get_version_retries = 3 ping_retries = 3 -ping_timeout = 5 +ping_timeout = 5 # Seconds scan_threads = 300 config_threads = 300 reboot_threads = 300 diff --git a/tools/web_testbench/_miners.py b/tools/web_testbench/_miners.py index 7281d465..a73daffb 100644 --- a/tools/web_testbench/_miners.py +++ b/tools/web_testbench/_miners.py @@ -57,7 +57,7 @@ class TestbenchMiner: await self.add_to_output("Found miner: " + str(miner)) if isinstance(miner, BOSMinerS9): if await self.get_bos_version() == self.latest_version: - await self.add_to_output("Already running the latest version of BraiinsOS, configuring.") + await self.add_to_output(f"Already running the latest version of BraiinsOS, {self.latest_version}, configuring.") self.state = REFERRAL return await self.add_to_output("Already running BraiinsOS, updating.") @@ -173,6 +173,11 @@ class TestbenchMiner: "Chip" ] = temps_raw["TEMPS"][board]["Chip"] + if len(temps_data.keys()) < 3: + for board in [6, 7, 8]: + if f"board_{board}" not in temps_data.keys(): + temps_data[f"board_{board}"] = {"Chip": 0, "Board": 0} + # parse individual board and chip temperature data for board in temps_data.keys(): if "Board" not in temps_data[board].keys(): @@ -212,11 +217,17 @@ class TestbenchMiner: async def install_done(self): await self.add_to_output("Waiting for disconnect...") - while await ping_miner(self.host) and self.state == DONE: - data = await self.get_web_data() - await ConnectionManager().broadcast_json(data) - await asyncio.sleep(1) + try: + while await ping_miner(self.host) and self.state == DONE: + data = await self.get_web_data() + await ConnectionManager().broadcast_json(data) + await asyncio.sleep(1) + except: + self.state = START + await self.add_to_output("Miner disconnected, waiting for new miner.") + return self.state = START + await self.add_to_output("Miner disconnected, waiting for new miner.") 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 9066fce0..cef3b1cf 100644 --- a/tools/web_testbench/templates/index.html +++ b/tools/web_testbench/templates/index.html @@ -369,15 +369,16 @@ ws.onmessage = function(event) { } else if (data.hasOwnProperty("text")) { var miner_graphs = document.getElementById(data["IP"] + "-graphs") miner_graphs.hidden = true - var miner_stdout = document.getElementById(data["IP"] + "-stdout_text") + var miner_stdout = document.getElementById(data["IP"] + "-stdout") + var miner_stdout_text = document.getElementById(data["IP"] + "-stdout_text") miner_stdout.hidden = false - miner_stdout.innerHTML = data["text"] + miner_stdout.innerHTML + 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") - console.log(data) if (data["Light"] == "show") { - console.log(light_box) light_box.style = "display: flex;" } else if (data["Light"] == "hide") { light_box.style = "display: none;"