Nix
/
BroSpeedTester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove doublechecking speed, was bugging out orange pi

master
Nixellion 2020-07-06 00:08:13 +03:00
parent 7df73ed93a
commit e158d76264
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.yaml
View File

@ -9,8 +9,6 @@ ros_du_invert: False
ros_fasttrack_comment: "defconf: fasttrack" ros_fasttrack_comment: "defconf: fasttrack"
# Minimum speed which not to cross, if speed is lower than this it will set this speed # Minimum speed which not to cross, if speed is lower than this it will set this speed
ros_minimum_speed: 100000 ros_minimum_speed: 100000
# If speed is lower than doublecheck_speed - run another test after a delay to make sure it was not an error
ros_doublecheck_speed: 300000
# Speed at which to leave fasttrack on. Use if your ROS device's CPU can't handle max speed you get, for example LHG LTE # Speed at which to leave fasttrack on. Use if your ROS device's CPU can't handle max speed you get, for example LHG LTE
# starts to show high CPU usage at close to 20mbit. # starts to show high CPU usage at close to 20mbit.
# Not implemented yet # Not implemented yet

25
speedtester.py
View File

@ -8,6 +8,7 @@ setup_logging()
# endregion # endregion
from statistics import median from statistics import median
from threading import Thread from threading import Thread
from datetime import datetime
import speedtest import speedtest
from dbo import Entry from dbo import Entry
import routeros_api import routeros_api
@ -280,20 +281,13 @@ def threaded_wan_speed():
def test_speed(): def test_speed():
global wan_download global wan_download
tries = 2 reset_globals()
for i in range(tries): sws = Thread(target=threaded_wan_speed)
reset_globals() st = Thread(target=threaded_speedtest)
sws = Thread(target=threaded_wan_speed) st.start()
st = Thread(target=threaded_speedtest) sws.start()
st.start() st.join()
sws.start() sws.join()
st.join()
sws.join()
if wan_download >= config['ros_doublecheck_speed']:
break
elif i < tries - 1:
log.warning("Speed is below ros_doublecheck_speed limit, retrying in a few seconds.")
time.sleep(10)
return return
@ -380,7 +374,8 @@ if __name__ == "__main__":
"wan_download": mbits(wan_download), "wan_download": mbits(wan_download),
"wan_upload": mbits(wan_upload), "wan_upload": mbits(wan_upload),
"quality": int(range_convert(mbits(wan_download), config['bad_speed_mbps'], config['good_speed_mbps'], 1, 5)), "quality": int(range_convert(mbits(wan_download), config['bad_speed_mbps'], config['good_speed_mbps'], 1, 5)),
"quality_percent": int(range_convert(mbits(wan_download), config['bad_speed_mbps'], config['good_speed_mbps'], 1, 100)) "quality_percent": int(range_convert(mbits(wan_download), config['bad_speed_mbps'], config['good_speed_mbps'], 1, 100)),
"datetime": datetime.now()
}) })
except: except: