added rover's ip address to deepsream

CSUFTitanRover · Jan 5, 2018 · 425bfc0 · 425bfc0
1 parent 0c9d162
commit 425bfc0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/rover/core/servers/iftop/iftop.py b/rover/core/servers/iftop/iftop.py
@@ -16,6 +16,7 @@
         out, err = p.communicate()
         uploadArr = re.findall(r"Total send rate:\s+(\d{1,}\.{0,1}\d{0,})(\w+)", out)
         downloadArr = re.findall(r"Total receive rate:\s+(\d{1,}\.{0,1}\d{0,})(\w+)", out)
+        ipAddress = re.findall(r"(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})", out)[0]
         upload = 0
         download = 0
         if uploadArr is not [] and downloadArr is not []:
@@ -29,10 +30,12 @@
                 upload = upload * 1000000
             if downloadArr[0][1] == "Mb":
                 download = download * 1000000
-            print "Upload: {} {} Download: {} {}".format(upload, uploadArr[0][1], download , downloadArr[0][1])
-            post({"upload": upload, "download": download}, recordName)
+            print "Upload: {} {} Download: {} {} IP: {}".format(upload, uploadArr[0][1], download , downloadArr[0][1], ipAddress)
+            post({"upload": upload, "download": download, "ip": ipAddress}, recordName)
     except:
         try:
             post({}, "speed")
+            print("No data from interface: " + interface)
+            sleep(1)
         except:
             print("cannot connect to deepstream.")