Merge pull request #50 from plaintextpackets/issue_3_speedtest_issues

Issue 3 speedtest issues
plaintextpackets · May 22, 2024 · 9103176 · 9103176
2 parents d638071 + ab7ebcb
commit 9103176
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 23 deletions.
diff --git a/helpers/network_helper.py b/helpers/network_helper.py
@@ -138,6 +138,7 @@ def netprobe_speedtest(self):
 
     def collect(self):
 
+        self.speedtest_stats = {"download": None, "upload": None}
         self.netprobe_speedtest()
 
         results = json.dumps({

diff --git a/netprobe.py b/netprobe.py
@@ -48,7 +48,7 @@
 
             cache.redis_write('netprobe',json.dumps(stats),cache_interval)
 
-            logger.info(f"Stats successfully written to Redis from device ID for Netprobe")
+            #logger.info(f"Stats successfully written to Redis from device ID for Netprobe")
 
         except Exception as e:
 

diff --git a/netprobe_speedtest.py b/netprobe_speedtest.py
@@ -21,36 +21,41 @@
 
     logger = setup_logging("logs/speedtest.log")
 
-    while True:
+    if speedtest_enabled == True:
 
-        try:
-            stats = collector.collect()
-            current_time = datetime.now()
+        while True:
+
+            try:
+                stats = collector.collect()
+                current_time = datetime.now()
 
-        except Exception as e:
-            print("Error running speedtest")
-            logger.error("Error running speedtest")
-            logger.error(e)
-            time.sleep(speedtest_interval)  # Pause before retrying
-            continue
+            except Exception as e:
+                print("Error running speedtest")
+                logger.error("Error running speedtest")
+                logger.error(e)
+                time.sleep(speedtest_interval)  # Pause before retrying
+                continue
 
-        # Connect to Redis
+            # Connect to Redis
 
-        try:
+            try:
 
-            cache = RedisConnect()
+                cache = RedisConnect()
 
-            # Save Data to Redis
+                # Save Data to Redis
 
-            cache_interval = speedtest_interval*2 # Set the redis cache 2x longer than the speedtest interval
+                cache_interval = speedtest_interval*2 # Set the redis cache 2x longer than the speedtest interval
 
-            cache.redis_write('speedtest',json.dumps(stats),cache_interval)
+                cache.redis_write('speedtest',json.dumps(stats),cache_interval)
 
-            logger.info(f"Stats successfully written to Redis for Speed Test")
+                logger.info(f"Stats successfully written to Redis for Speed Test")
 
-        except Exception as e:
+            except Exception as e:
 
-            logger.error("Could not connect to Redis")
-            logger.error(e)
-
-        time.sleep(speedtest_interval)
+                logger.error("Could not connect to Redis")
+                logger.error(e)
+
+            time.sleep(speedtest_interval)
+
+    else:
+        exit()