added bugfix to more sensors. Bug could lead to sensor processes basically hanging up

Author: Konstantin Wolff

miniprobe/sensors/adns.py

@@ -133,6 +133,7 @@ def get_data(data, out_queue):
                 "message": "DNS sensor failed. See log for details"
             }
             out_queue.put(data_r)
+            return 1
         dns_channel = adns.get_dns(int(timed*1000))
         addressdata = []
         for element in dns_channel:
@@ -153,6 +154,7 @@ def get_data(data, out_queue):
         del result
         gc.collect()
         out_queue.put(data)
+        return 0
 
     @staticmethod
     def get_dns(time):

miniprobe/sensors/apt.py

@@ -117,6 +117,8 @@ def get_data(data, out_queue):
                 "message": "APT failed. %s" % e
             }
             out_queue.put(data_r)
+            return 1
         del apt
         gc.collect()
         out_queue.put(data_r)
+        return 0

miniprobe/sensors/cpuload.py

@@ -67,6 +67,7 @@ def get_data(data, out_queue):
                 "message": "CPU load sensor failed. See log for details"
             }
             out_queue.put(data)
+            return 1
         cpudata = []
         for element in cpu:
             cpudata.append(element)
@@ -78,6 +79,7 @@ def get_data(data, out_queue):
         del cpuload
         gc.collect()
         out_queue.put(data)
+        return 0
 
     @staticmethod
     def read_cpu(path):

miniprobe/sensors/cputemp.py

@@ -88,7 +88,8 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "CPUTemp sensor failed. See log for details"
             }
-            return out_queue.put(data)
+            out_queue.put(data)
+            return 1
         tempdata = []
         for element in temp:
             tempdata.append(element)
@@ -100,6 +101,7 @@ def get_data(data, out_queue):
         del temperature
         gc.collect()
         out_queue.put(data)
+        return 1
 
     @staticmethod
     def read_temp(config):

miniprobe/sensors/diskspace.py

@@ -68,6 +68,7 @@ def get_data(data, out_queue):
                 "message": "Disk Space Sensor failed. See log for details"
             }
             out_queue.put(data)
+            return 1
         channels = disk
         data = {
             "sensorid": int(data['sensorid']),
@@ -77,6 +78,7 @@ def get_data(data, out_queue):
         del diskspace
         gc.collect()
         out_queue.put(data)
+        return 0
 
     def read_disk(self):
         disks = []

miniprobe/sensors/ds18b20.py

@@ -95,6 +95,7 @@ def get_data(data, out_queue):
                 "message": "DS18B20 sensor failed. See log for details"
             }
             out_queue.put(data)
+            return 1
         tempdata = []
         for element in temp:
             tempdata.append(element)
@@ -106,6 +107,7 @@ def get_data(data, out_queue):
         del temperature
         gc.collect()
         out_queue.put(data)
+        return 0
 
     @staticmethod
     def read_temp(config):

miniprobe/sensors/external_ip.py

@@ -73,6 +73,7 @@ def get_data(data, out_queue):
                 "message": "External IP sensor failed. See log for details"
             }
             out_queue.put(data)
+            return 1
         addressdata = []
         for element in address:
             addressdata.append(element)
@@ -84,6 +85,7 @@ def get_data(data, out_queue):
         del address
         gc.collect()
         out_queue.put(data)
+        return 0
 
     @staticmethod
     def get_ip(url):

miniprobe/sensors/http.py

@@ -190,6 +190,7 @@ def get_data(data, out_queue):
                 "message": "HTTP Request failed. See log for details"
             }
             out_queue.put(data)
+            return 1
 
         data = {
             "sensorid": int(data['sensorid']),
@@ -205,3 +206,4 @@ def get_data(data, out_queue):
         del http
         gc.collect()
         out_queue.put(data)
+        return 0

miniprobe/sensors/memory.py

@@ -67,6 +67,7 @@ def get_data(data, out_queue):
                 "message": "Memory sensor failed. See log for details"
             }
             out_queue.put(data)
+            return 1
         memorydata = []
         for element in mem:
             memorydata.append(element)
@@ -78,6 +79,7 @@ def get_data(data, out_queue):
         del memory
         gc.collect()
         out_queue.put(data)
+        return 0
 
     def read_memory(self, path):
         mem = open(path, "r")

miniprobe/sensors/nmap.py

@@ -124,7 +124,7 @@ def get_data(data, out_queue):
                 "message": "Port check failed or ports closed. See log for details"
             }
             out_queue.put(sensor_data)
-            return
+            return 1
         sensor_data = {
             "sensorid": int(data['sensorid']),
             "message": alive_str[:-2],
@@ -133,6 +133,7 @@ def get_data(data, out_queue):
         del nmap
         gc.collect()
         out_queue.put(sensor_data)
+        return 0
 
     def ip2bin(self,ip):
         b = ""