adapted setup.py to new classnames, fixed bug in probehealth sensor

Author: Konstantin Wolff

miniprobe/sensors/probehealth.py

@@ -210,10 +210,13 @@ def read_temp(self):
         data = []
         chandata = []
         try:
-            temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
-            lines = temp.readlines()
-            temp.close()
-            temp_string = lines[0]
+            if os.path.exists("/sys/class/thermal/thermal_zone0/temp"):
+                temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
+                lines = temp.readlines()
+                temp.close()
+                temp_string = lines[0]
+            else:
+                return chandata
         except OSError:
             logging.debug("Could not read temp file, no data will be returned")
             return chandata
@@ -238,13 +241,16 @@ def read_probe_health(self, config):
         data = []
         chandata = []
         try:
-            temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
-            lines = temp.readlines()
-            temp.close()
-            temp_float = float(lines[0]) / 1000.0
-            if temp_float > config['maxtemp']:
-                health -= 25
-                logging.debug("Current Health: %s percent" % health)
+            if os.path.exists("/sys/class/thermal/thermal_zone0/temp"):
+                temp = open("/sys/class/thermal/thermal_zone0/temp", "r")
+                lines = temp.readlines()
+                temp.close()
+                temp_float = float(lines[0]) / 1000.0
+                if temp_float > config['maxtemp']:
+                    health -= 25
+                    logging.debug("Current Health: %s percent" % health)
+            else:
+                return chandata
         except OSError:
             logging.debug("Health not changed, no temperature available")
             pass

setup.py

@@ -138,7 +138,7 @@ def init_script(self, script_path, user):
         return init_script_tpl.read() % (script_path, user)
 
     def write_load_list(self, ds18b20_sensors, other_sensors):
-        default_sensors = "Ping,HTTP,Port,SNMPCustom,CPULoad,Memory,Diskspace,SNMPTraffic,CPUTemp,Probehealth,External_IP,aDNS,APT,NMAP"
+        default_sensors = "Ping,HTTP,Port,SNMPCustom,CPULoad,Memory,Diskspace,SNMPTraffic,CPUTemp,Probehealth,ExternalIP,ADNS,APT,NMAP"
         if not (other_sensors == ""):
             default_sensors = default_sensors + "," + other_sensors
         f=open("./miniprobe/sensors/__init__.py","a")