From c070a5324b3de7e93302f4afe784b8a05f43e595 Mon Sep 17 00:00:00 2001 From: Nixellion Date: Thu, 30 Jul 2020 15:35:07 +0300 Subject: [PATCH] Use minimum speed --- config/config.yaml | 2 +- speedtester.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 6753e6d..e451fda 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -12,7 +12,7 @@ ros_dynamic_speed: true ros_fasttrack_comment: 'defconf: fasttrack' ros_ip: 192.168.88.1 ros_maximum_speed: 15000000 -ros_minimum_speed: 100000 +ros_minimum_speed: 300000 speedtest_threads: 4 speedtest_master_threads: 4 ros_queues: diff --git a/speedtester.py b/speedtester.py index c5ac77d..7bf6589 100644 --- a/speedtester.py +++ b/speedtester.py @@ -247,8 +247,18 @@ def ros_dynamic_speed(upload, download): "all" in config['ros_queues'] and queue["name"] not in config['ros_queues_except']): if queue['name'] in data_dict['wan_downloads']: log.info(f"{queue['name']} found in data dict, setting individual limit.") - down = data_dict['wan_downloads'][queue['name']] - up = data_dict['wan_uploads'][queue['name']] + + # Check if below minimum speed + if data_dict['wan_downloads'][queue['name']] < config['ros_minimum_speed']: + down = config['ros_minimum_speed'] + else: + down = data_dict['wan_downloads'][queue['name']] + + # Check if below minimum speed + if data_dict['wan_uploads'][queue['name']] < config['ros_minimum_speed']: + up = config['ros_minimum_speed'] + else: + up = data_dict['wan_uploads'][queue['name']] else: log.info(f"{queue['name']} was not found in data dict, setting total limit.") log.debug(data_dict)