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

added miner model and hashrate as a table in the per miner stuff

Browse Source
This commit is contained in:
UpstreamData
2022-03-04 16:10:27 -07:00
parent 936c230aa3
commit f315c0c051
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/web_monitor/app.py
View File

@@ -105,6 +105,8 @@ async def miner_websocket(websocket: WebSocket, miner_ip):
data = await asyncio.wait_for(cur_miner.api.multicommand("summary", "fans", "stats"), 5) data = await asyncio.wait_for(cur_miner.api.multicommand("summary", "fans", "stats"), 5)
miner_model = await cur_miner.get_model()
miner_summary = None miner_summary = None
miner_stats = None miner_stats = None
miner_fans = None miner_fans = None
@@ -152,7 +154,8 @@ async def miner_websocket(websocket: WebSocket, miner_ip):
data = {"hashrate": hashrate, data = {"hashrate": hashrate,
"fans": fan_speeds, "fans": fan_speeds,
"datetime": datetime.datetime.now().isoformat()} "datetime": datetime.datetime.now().isoformat(),
"model": miner_model}
await websocket.send_json(data) await websocket.send_json(data)
await asyncio.sleep(1) await asyncio.sleep(1)
except asyncio.exceptions.TimeoutError: except asyncio.exceptions.TimeoutError:

15
tools/web_monitor/templates/miner.html
View File

@@ -52,6 +52,15 @@
</div> </div>
</div> </div>
<div class="d-flex align-items-center mt-4 ms-4 alert alert-secondary">
<div class="mx-auto">Model:</div>
<div class="mx-auto fw-bolder" id="minerModel">?</div>
<div class="mx-auto" style="border-left: 1px solid grey; height: 50px;"></div>
<div class="mx-auto">Hashrate:</div>
<div class="mx-auto fw-bolder" id="minerHashrate">?</div>
</div>
<div id="errorContainer" class="d-flex align-items-center mt-4 ms-4 alert alert-danger invisible"> <div id="errorContainer" class="d-flex align-items-center mt-4 ms-4 alert alert-danger invisible">
<strong id="errorCode"></strong> <strong id="errorCode"></strong>
<div class="spinner-border ms-auto"></div> <div class="spinner-border ms-auto"></div>
@@ -68,6 +77,8 @@ ws.onmessage = function(event) {
var err_code = document.getElementById("errorCode") var err_code = document.getElementById("errorCode")
err_code.innerHTML = new_data['error'] err_code.innerHTML = new_data['error']
err_container.classList.remove("invisible") err_container.classList.remove("invisible")
var miner_hr = document.getElementById("minerHashrate")
miner_hr.innerHTML = "?"
} else { } else {
var chart = document.getElementById("line-chart") var chart = document.getElementById("line-chart")
var err_container = document.getElementById("errorContainer") var err_container = document.getElementById("errorContainer")
@@ -92,6 +103,10 @@ ws.onmessage = function(event) {
fan3Chart.update(); fan3Chart.update();
fan4Chart.update(); fan4Chart.update();
minerDataChart.update(); minerDataChart.update();
var miner_hr = document.getElementById("minerHashrate")
miner_hr.innerHTML = new_data["hashrate"] + " TH/s"
var miner_model = document.getElementById("minerModel")
miner_model.innerHTML = new_data["model"]
}; };
}; };