added sending output from miners
This commit is contained in:
@@ -3,11 +3,10 @@ import asyncio
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
from network import ping_miner
|
from network import ping_miner
|
||||||
from network.net_range import MinerNetworkRange
|
|
||||||
from miners.miner_factory import MinerFactory
|
from miners.miner_factory import MinerFactory
|
||||||
from miners.antminer.S9.bosminer import BOSMinerS9
|
from miners.antminer.S9.bosminer import BOSMinerS9
|
||||||
|
from tools.web_testbench._network import miner_network
|
||||||
miner_network = MinerNetworkRange("192.168.1.10-192.168.1.33")
|
from tools.web_testbench.app import ConnectionManager
|
||||||
|
|
||||||
REFERRAL_FILE_S9 = os.path.join(os.path.dirname(__file__), "files", "referral.ipk")
|
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")
|
UPDATE_FILE_S9 = os.path.join(os.path.dirname(__file__), "files", "update.tar")
|
||||||
@@ -24,7 +23,9 @@ class testbenchMiner:
|
|||||||
self.state = START
|
self.state = START
|
||||||
|
|
||||||
async def add_to_output(self, message):
|
async def add_to_output(self, message):
|
||||||
# send a message to web server
|
await ConnectionManager().broadcast_json(
|
||||||
|
{"IP": self.host, "text": str(message)}
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
async def remove_from_cache(self):
|
async def remove_from_cache(self):
|
||||||
|
|||||||
3
tools/web_testbench/_network.py
Normal file
3
tools/web_testbench/_network.py
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
from network import MinerNetwork
|
||||||
|
|
||||||
|
miner_network = MinerNetwork("192.168.1.10-192.168.1.33").get_network()
|
||||||
@@ -7,7 +7,7 @@ import uvicorn
|
|||||||
import os
|
import os
|
||||||
from fastapi.templating import Jinja2Templates
|
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
|
from tools.web_testbench.feeds import update_installer_files
|
||||||
|
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
@@ -102,8 +102,11 @@ def start_monitor():
|
|||||||
|
|
||||||
async def monitor():
|
async def monitor():
|
||||||
while True:
|
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 asyncio.sleep(5)
|
||||||
|
await ConnectionManager().broadcast_json(miner_data)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|||||||
@@ -105,7 +105,8 @@ var ws = new WebSocket("ws://{{request.url.hostname}}:{% if request.url.port %}{
|
|||||||
|
|
||||||
// create text area for data
|
// create text area for data
|
||||||
var text_area = document.createElement('textarea');
|
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.className = "form-control"
|
||||||
text_area.style = "font-size: 12px"
|
text_area.style = "font-size: 12px"
|
||||||
text_area.disabled = true
|
text_area.disabled = true
|
||||||
@@ -331,10 +332,10 @@ var ws = new WebSocket("ws://{{request.url.hostname}}:{% if request.url.port %}{
|
|||||||
fan_2_graph.update();
|
fan_2_graph.update();
|
||||||
} else {
|
} else {
|
||||||
var miner_graphs = document.getElementById(data["IP"] + "-graphs")
|
var miner_graphs = document.getElementById(data["IP"] + "-graphs")
|
||||||
console.log(data["IP"] + "-graphs");
|
miner_graphs.hidden = true
|
||||||
console.log(miner_graphs);
|
var miner_stdout = document.getElementById(data["IP"] + "-stdout_text")
|
||||||
// miner_graphs.hidden = true
|
miner_stdout.hidden = false
|
||||||
console.log(data)
|
miner_stdout.innerHTML += data["text"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user