2
0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00

Plugin weather_: fixes style issues

This commit is contained in:
Lars Kruse 2018-03-27 04:18:45 +02:00
parent a4a9e755b5
commit 34840ad9db

View File

@ -11,51 +11,51 @@ re_tmp = re.compile('realTemp: "(\d+)"')
re_hum = re.compile('relativeHumidity: "(\d+)"') re_hum = re.compile('relativeHumidity: "(\d+)"')
re_loc = re.compile('locName: "([\w ]+)"') re_loc = re.compile('locName: "([\w ]+)"')
#code = sys.argv[0][(sys.argv[0].rfind('_') + 1):] # code = sys.argv[0][(sys.argv[0].rfind('_') + 1):]
code = os.environ.get('code', sys.argv[0][(sys.argv[0].rfind('_') + 1):]) code = os.environ.get('code', sys.argv[0][(sys.argv[0].rfind('_') + 1):])
if code == None: sys.exit(1) if not code:
sys.exit(1)
if len(sys.argv) == 2 and sys.argv[1] == "autoconf": elif len(sys.argv) == 2 and sys.argv[1] == "autoconf":
print "yes" print("yes")
elif len(sys.argv) == 2 and sys.argv[1] == "config": elif len(sys.argv) == 2 and sys.argv[1] == "config":
u = urllib.urlopen(url % code) u = urllib.urlopen(url % code)
txt = u.read() txt = u.read()
u.close() u.close()
LOC_list = re_loc.findall(txt) LOC_list = re_loc.findall(txt)
if len(LOC_list):
LOC = LOC_list[0]
else:
LOC = "Unknown"
print 'graph_title Weather in %s' % LOC if len(LOC_list):
print 'graph_vlabel Temperature and Humidity' LOC = LOC_list[0]
print 'graph_category sensors' else:
LOC = "Unknown"
print 'temperature.label Temperature' print('graph_title Weather in %s' % LOC)
print 'humidity.label Humidity' print('graph_vlabel Temperature and Humidity')
print('graph_category sensors')
print 'graph_args --base 1000 -l 0' print('temperature.label Temperature')
print('humidity.label Humidity')
print('graph_args --base 1000 -l 0')
else: else:
u = urllib.urlopen(url % code) u = urllib.urlopen(url % code)
txt = u.read() txt = u.read()
u.close() u.close()
TMP_F_list = re_tmp.findall(txt) TMP_F_list = re_tmp.findall(txt)
HUM_list = re_hum.findall(txt) HUM_list = re_hum.findall(txt)
if len(HUM_list): if len(HUM_list):
HUM = HUM_list[0] HUM = HUM_list[0]
else: else:
sys.exit(1) sys.exit(1)
if len(TMP_F_list): if len(TMP_F_list):
TMP_F = TMP_F_list[0] TMP_F = TMP_F_list[0]
TMP_C = (int(TMP_F) - 32) * 5/9 TMP_C = (int(TMP_F) - 32) * 5/9
else: else:
sys.exit(1) sys.exit(1)
print 'temperature.value %s' % TMP_C print('temperature.value %s' % TMP_C)
print 'humidity.value %s' % HUM print('humidity.value %s' % HUM)