diff --git a/.gitignore b/.gitignore index 06cc4ae..5bbbf22 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,7 @@ test.png data/database.db-shm data/database.db-wal test2.py +speeds.txt +test3.py +test4.py +speeds.txt diff --git a/config/config.yaml b/config/config.yaml index 94d08ec..7ecc3f4 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -8,7 +8,9 @@ ros_queues: 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: 300000 +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 56bb59c..a8eb1bc 100644 --- a/speedtester.py +++ b/speedtester.py @@ -194,12 +194,22 @@ def threaded_wan_speed(): def test_speed(): - sws = Thread(target=threaded_wan_speed) - st = Thread(target=threaded_speedtest) - st.start() - sws.start() - st.join() - sws.join() + global wan_download + tries = 2 + for i in range(tries): + 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 + else: + log.warning ("Speed is below ros_doublecheck_speed limit, retrying in a few seconds.") + time.sleep(10) + return + def generate_database_reports():