fixed bug in sensor error handling which could cause a deadlock on the probe

konstantinpae · konstantinpae · commit 7dc610a10590 · 2014-12-16T19:49:10.000+01:00
diff --git a/sensors/cpuload.py b/sensors/cpuload.py
@@ -66,7 +66,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "CPU load sensor failed. See log for details"
             }
-            return data
+            out_queue.put(data)
         cpudata = []
         for element in cpu:
             cpudata.append(element)
diff --git a/sensors/diskspace.py b/sensors/diskspace.py
@@ -67,7 +67,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "Disk Space Sensor failed. See log for details"
             }
-            return data
+            out_queue.put(data)
         channels = disk
         data = {
             "sensorid": int(data['sensorid']),
diff --git a/sensors/http.py b/sensors/http.py
@@ -189,7 +189,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "HTTP Request failed. See log for details"
             }
-            return data
+            out_queue.put(data)
         
         data = {
             "sensorid": int(data['sensorid']),
diff --git a/sensors/memory.py b/sensors/memory.py
@@ -66,7 +66,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "Memory sensor failed. See log for details"
             }
-            return data
+            out_queue.put(data)
         memorydata = []
         for element in mem:
             memorydata.append(element)
diff --git a/sensors/ping.py b/sensors/ping.py
@@ -149,7 +149,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "Ping failed. %s" % e
             }
-            return data
+            out_queue.put(data)
         data = {
             "sensorid": int(data['sensorid']),
             "message": "OK",
diff --git a/sensors/port.py b/sensors/port.py
@@ -126,7 +126,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "Port check failed. See log for details"
             }
-            return data
+            out_queue.put(data)
         data = {
             "sensorid": int(data['sensorid']),
             "message": "OK Port %s available" % data['targetport'],
diff --git a/sensors/snmpcustom.py b/sensors/snmpcustom.py
@@ -188,7 +188,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "SNMP Request failed. See log for details"
             }
-            return data
+            out_queue.put(data)
 
         data = {
             "sensorid": int(data['sensorid']),
diff --git a/sensors/snmptraffic.py b/sensors/snmptraffic.py
@@ -200,7 +200,7 @@ def get_data(data, out_queue):
                 "code": 1,
                 "message": "SNMP Request failed. See log for details"
             }
-            return data
+            out_queue.put(data)
 
         data = {
             "sensorid": int(data['sensorid']),

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ def get_data(data, out_queue):`
`66`	`66`	`"code": 1,`
`67`	`67`	`"message": "CPU load sensor failed. See log for details"`
`68`	`68`	`}`
`69`		`- return data`
	`69`	`+ out_queue.put(data)`
`70`	`70`	`cpudata = []`
`71`	`71`	`for element in cpu:`
`72`	`72`	`cpudata.append(element)`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ def get_data(data, out_queue):`
`67`	`67`	`"code": 1,`
`68`	`68`	`"message": "Disk Space Sensor failed. See log for details"`
`69`	`69`	`}`
`70`		`- return data`
	`70`	`+ out_queue.put(data)`
`71`	`71`	`channels = disk`
`72`	`72`	`data = {`
`73`	`73`	`"sensorid": int(data['sensorid']),`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ def get_data(data, out_queue):`
`189`	`189`	`"code": 1,`
`190`	`190`	`"message": "HTTP Request failed. See log for details"`
`191`	`191`	`}`
`192`		`- return data`
	`192`	`+ out_queue.put(data)`
`193`	`193`
`194`	`194`	`data = {`
`195`	`195`	`"sensorid": int(data['sensorid']),`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ def get_data(data, out_queue):`
`149`	`149`	`"code": 1,`
`150`	`150`	`"message": "Ping failed. %s" % e`
`151`	`151`	`}`
`152`		`- return data`
	`152`	`+ out_queue.put(data)`
`153`	`153`	`data = {`
`154`	`154`	`"sensorid": int(data['sensorid']),`
`155`	`155`	`"message": "OK",`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def get_data(data, out_queue):`
`126`	`126`	`"code": 1,`
`127`	`127`	`"message": "Port check failed. See log for details"`
`128`	`128`	`}`
`129`		`- return data`
	`129`	`+ out_queue.put(data)`
`130`	`130`	`data = {`
`131`	`131`	`"sensorid": int(data['sensorid']),`
`132`	`132`	`"message": "OK Port %s available" % data['targetport'],`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ def get_data(data, out_queue):`
`188`	`188`	`"code": 1,`
`189`	`189`	`"message": "SNMP Request failed. See log for details"`
`190`	`190`	`}`
`191`		`- return data`
	`191`	`+ out_queue.put(data)`
`192`	`192`
`193`	`193`	`data = {`
`194`	`194`	`"sensorid": int(data['sensorid']),`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ def get_data(data, out_queue):`
`200`	`200`	`"code": 1,`
`201`	`201`	`"message": "SNMP Request failed. See log for details"`
`202`	`202`	`}`
`203`		`- return data`
	`203`	`+ out_queue.put(data)`
`204`	`204`
`205`	`205`	`data = {`
`206`	`206`	`"sensorid": int(data['sensorid']),`