diff --git a/config/config.yaml b/config/config.yaml index 77d0ff2..5780a4d 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -9,8 +9,6 @@ ros_du_invert: False ros_fasttrack_comment: "defconf: fasttrack" # Minimum speed which not to cross, if speed is lower than this it will set this speed 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 # starts to show high CPU usage at close to 20mbit. # Not implemented yet diff --git a/speedtester.py b/speedtester.py index 73822b7..4e7e40d 100644 --- a/speedtester.py +++ b/speedtester.py @@ -8,6 +8,7 @@ setup_logging() # endregion from statistics import median from threading import Thread +from datetime import datetime import speedtest from dbo import Entry import routeros_api @@ -280,20 +281,13 @@ def threaded_wan_speed(): def test_speed(): global wan_download - tries = 2 - for i in range(tries): - reset_globals() - sws = Thread(target=threaded_wan_speed) - st = Thread(target=threaded_speedtest) - st.start() - sws.start() - 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) + reset_globals() + sws = Thread(target=threaded_wan_speed) + st = Thread(target=threaded_speedtest) + st.start() + sws.start() + st.join() + sws.join() return @@ -380,7 +374,8 @@ if __name__ == "__main__": "wan_download": mbits(wan_download), "wan_upload": mbits(wan_upload), "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: