nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-27 19:25:27 +03:00
Code Issues Projects Releases Wiki Activity

hddtemp: handle 'UNK' status as well (#824)

Browse Source
This commit is contained in:
Alessio Sergi 2016-03-29 13:33:53 +02:00
parent 8c5b74ed6a
commit a467d22b9b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glances/plugins/glances_hddtemp.py
View File

@ -95,7 +95,14 @@ class GlancesGrabHDDTemp(object):
return
# Fetch the data
# data = "|/dev/sda|WDC WD2500JS-75MHB0|44|C||/dev/sdb|WDC WD2500JS-75MHB0|35|C||/dev/sdc|WDC WD3200AAKS-75B3A0|45|C||/dev/sdd|WDC WD3200AAKS-75B3A0|45|C||/dev/sde|WDC WD3200AAKS-75B3A0|43|C||/dev/sdf|SAMSUNG HM321HI|39|C||/dev/sdg|HGST HTS541010A9E680|SLP|*|"
# data = ("|/dev/sda|WDC WD2500JS-75MHB0|44|C|"
# "|/dev/sdb|WDC WD2500JS-75MHB0|35|C|"
# "|/dev/sdc|WDC WD3200AAKS-75B3A0|45|C|"
# "|/dev/sdd|WDC WD3200AAKS-75B3A0|45|C|"
# "|/dev/sde|WDC WD3200AAKS-75B3A0|43|C|"
# "|/dev/sdf|???|ERR|*|"
# "|/dev/sdg|HGST HTS541010A9E680|SLP|*|"
# "|/dev/sdh|HGST HTS541010A9E680|UNK|*|")
data = self.fetch()
# Exit if no data
@ -123,7 +130,7 @@ class GlancesGrabHDDTemp(object):
try:
hddtemp_current['value'] = float(temperature)
except ValueError:
# Temperature could be 'ERR' or 'SLP' (see issue#824)
# Temperature could be 'ERR', 'SLP' or 'UNK' (see issue #824)
hddtemp_current['value'] = temperature
hddtemp_current['unit'] = unit
self.hddtemp_list.append(hddtemp_current)

3
glances/plugins/glances_sensors.py
View File

@ -194,8 +194,7 @@ class Plugin(GlancesPlugin):
else:
msg = '{0:13}'.format(label[:13])
ret.append(self.curse_add_line(msg))
# Temperature could be 'ERR' or 'SLP' (see issue#824)
if i['value'] in (b'ERR', b'SLP'):
if i['value'] in (b'ERR', b'SLP', b'UNK'):
msg = '{0:>8}'.format(i['value'])
ret.append(self.curse_add_line(
msg, self.get_views(item=i[self.get_key()],