master
Nixellion 2020-07-11 21:05:22 +03:00
parent 18fc489b91
commit 6caf1f365e
3 changed files with 17 additions and 10 deletions

View File

@ -15,7 +15,9 @@ ros_minimum_speed: 100000
# starts to show high CPU usage at close to 20mbit.
# Not implemented yet
ros_maximum_speed: 15000000 # 15 mbit
ros_wan_interface: lte1
ros_wan_interface:
- eth_LTE6_1
- eth_LTE_0
api_host: 0.0.0.0
api_port: 1357
bad_speed_mbps: 0.2

View File

@ -2,4 +2,6 @@ peewee
speedtest-cli
numpy
matplotlib
RouterOS-api
RouterOS-api
flask
flask-socketio

View File

@ -262,19 +262,22 @@ def threaded_wan_speed():
password=secrets["ros_password"], plaintext_login=True)
api = connection.get_api()
traffic = api.get_resource('/').call('interface/monitor-traffic',
{'interface': config['ros_wan_interface'], 'once': ' '})[0]
rx = 0
tx = 0
for interface in config['ros_wan_interface']:
traffic = api.get_resource('/').call('interface/monitor-traffic',
{'interface': interface, 'once': ' '})[0]
traffic['rx-bits-per-second'] = int(traffic['rx-bits-per-second'])
traffic['tx-bits-per-second'] = int(traffic['tx-bits-per-second'])
rx += int(traffic['rx-bits-per-second'])
tx += int(traffic['tx-bits-per-second'])
if downloading:
downloads.append(traffic['rx-bits-per-second'])
print(f"DL: {mbits(traffic['rx-bits-per-second'])} mbps;")
downloads.append(rx)
print(f"DL: {mbits(rx)} mbps;")
else:
if upload_warmed_up:
uploads.append(traffic['tx-bits-per-second'])
print(f"UP: {mbits(traffic['tx-bits-per-second'])} mbps;")
uploads.append(tx)
print(f"UP: {mbits(tx)} mbps;")
else:
print("Upload warm-up...")
time.sleep(2)