added sending output from miners

This commit is contained in:
UpstreamData
2022-04-14 10:57:32 -06:00
parent 4f6ebff880
commit 03f5cafe76
4 changed files with 19 additions and 11 deletions

View File

@@ -3,11 +3,10 @@ import asyncio
import os
from network import ping_miner
from network.net_range import MinerNetworkRange
from miners.miner_factory import MinerFactory
from miners.antminer.S9.bosminer import BOSMinerS9
miner_network = MinerNetworkRange("192.168.1.10-192.168.1.33")
from tools.web_testbench._network import miner_network
from tools.web_testbench.app import ConnectionManager
REFERRAL_FILE_S9 = os.path.join(os.path.dirname(__file__), "files", "referral.ipk")
UPDATE_FILE_S9 = os.path.join(os.path.dirname(__file__), "files", "update.tar")
@@ -24,7 +23,9 @@ class testbenchMiner:
self.state = START
async def add_to_output(self, message):
# send a message to web server
await ConnectionManager().broadcast_json(
{"IP": self.host, "text": str(message)}
)
return
async def remove_from_cache(self):

View File

@@ -0,0 +1,3 @@
from network import MinerNetwork
miner_network = MinerNetwork("192.168.1.10-192.168.1.33").get_network()

View File

@@ -7,7 +7,7 @@ import uvicorn
import os
from fastapi.templating import Jinja2Templates
from tools.web_testbench import miner_network
from tools.web_testbench._network import miner_network
from tools.web_testbench.feeds import update_installer_files
app = FastAPI()
@@ -102,8 +102,11 @@ def start_monitor():
async def monitor():
while True:
await ConnectionManager().broadcast_json(miner_data)
await ConnectionManager().broadcast_json(
{"IP": "192.168.1.11", "text": "hello\n"}
)
await asyncio.sleep(5)
await ConnectionManager().broadcast_json(miner_data)
if __name__ == "__main__":

View File

@@ -105,7 +105,8 @@ var ws = new WebSocket("ws://{{request.url.hostname}}:{% if request.url.port %}{
// create text area for data
var text_area = document.createElement('textarea');
text_area.rows = "10"
text_area.id = miner + "-stdout_text"
text_area.rows = "15"
text_area.className = "form-control"
text_area.style = "font-size: 12px"
text_area.disabled = true
@@ -331,10 +332,10 @@ var ws = new WebSocket("ws://{{request.url.hostname}}:{% if request.url.port %}{
fan_2_graph.update();
} else {
var miner_graphs = document.getElementById(data["IP"] + "-graphs")
console.log(data["IP"] + "-graphs");
console.log(miner_graphs);
// miner_graphs.hidden = true
console.log(data)
miner_graphs.hidden = true
var miner_stdout = document.getElementById(data["IP"] + "-stdout_text")
miner_stdout.hidden = false
miner_stdout.innerHTML += data["text"]
}
}
</script>