From ee8df548e1d735ca9f7f4dfe5e16d3d93e86123b Mon Sep 17 00:00:00 2001
From: Nixellion <nixesvfx@gmail.com>
Date: Thu, 9 Jul 2020 00:28:57 +0300
Subject: [PATCH] fix

---
 config/config.yaml |  3 ++-
 speedtester.py     | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index d8cd319..450cd59 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -4,7 +4,8 @@ output_txt_path: /var/www/downloads/speeds.txt
 ros_dynamic_speed: True
 ros_ip: 192.168.88.1
 ros_queues:
-  - all
+  - WAN
+  - VOIP
 ros_queues_except:
   - dummy
 ros_du_invert: False
diff --git a/speedtester.py b/speedtester.py
index 52a4a3f..71df3fb 100644
--- a/speedtester.py
+++ b/speedtester.py
@@ -248,11 +248,12 @@ def threaded_wan_speed():
         if speedtest_failed:
             return
         time.sleep(1)
-    print("Allow warm-up...")
-    time.sleep(0.5)
+    print("Download warm-up...")
+    time.sleep(2)
     uploads = []
     downloads = []
     print("Monitoring...")
+    upload_warmed_up = False
     while results_dict == None:
         connection = routeros_api.RouterOsApiPool(config['ros_ip'], username=secrets["ros_login"],
                                                   password=secrets["ros_password"], plaintext_login=True)
@@ -268,8 +269,13 @@ def threaded_wan_speed():
             downloads.append(traffic['rx-bits-per-second'])
             print(f"DL: {mbits(traffic['rx-bits-per-second'])} mbps;")
         else:
-            uploads.append(traffic['tx-bits-per-second'])
-            print(f"UP: {mbits(traffic['tx-bits-per-second'])} mbps;")
+            if upload_warmed_up:
+                uploads.append(traffic['tx-bits-per-second'])
+                print(f"UP: {mbits(traffic['tx-bits-per-second'])} mbps;")
+            else:
+                print("Upload warm-up...")
+                time.sleep(2)
+                upload_warmed_up = True
 
         time.sleep(1)
     global wan_download