summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolargo <nicolas@nicolargo.com>2014-06-21 14:38:12 +0200
committerNicolargo <nicolas@nicolargo.com>2014-06-21 14:38:12 +0200
commit07611c073067468fdb715ddd2d55ce54cfdfe75c (patch)
treea4de228832fd922e87c2987c714f7af5c6b2186f
parent0cad93d31aab405b47a815b9b71b24201036d93b (diff)
parente66dbe87eacdbc14ab456f38ed4fc3cf6ac0046a (diff)
Merge branch 'hotfix/issue373'
-rw-r--r--glances/plugins/glances_sensors.py32
1 files changed, 24 insertions, 8 deletions
diff --git a/glances/plugins/glances_sensors.py b/glances/plugins/glances_sensors.py
index 241706e0..5380445d 100644
--- a/glances/plugins/glances_sensors.py
+++ b/glances/plugins/glances_sensors.py
@@ -77,14 +77,30 @@ class Plugin(GlancesPlugin):
self.reset()
if self.get_input() == 'local':
- # Update stats using the standard system lib
- self.stats = self.__set_type(self.glancesgrabsensors.get(), 'temperature_core')
- # Append HDD temperature
- hddtemp = self.__set_type(self.hddtemp_plugin.update(), 'temperature_hdd')
- self.stats.extend(hddtemp)
- # Append Batteries %
- batpercent = self.__set_type(self.batpercent_plugin.update(), 'battery')
- self.stats.extend(batpercent)
+ # Update stats using the dedicated lib
+ try:
+ self.stats = self.__set_type(self.glancesgrabsensors.get(),
+ 'temperature_core')
+ except:
+ pass
+ # Update HDDtemp stats
+ try:
+ hddtemp = self.__set_type(self.hddtemp_plugin.update(),
+ 'temperature_hdd')
+ except:
+ pass
+ else:
+ # Append HDD temperature
+ self.stats.extend(hddtemp)
+ # Update batteries stats
+ try:
+ batpercent = self.__set_type(self.batpercent_plugin.update(),
+ 'battery')
+ except:
+ pass
+ else:
+ # Append Batteries %
+ self.stats.extend(batpercent)
elif self.get_input() == 'snmp':
# Update stats using SNMP
# No standard: http://www.net-snmp.org/wiki/index.php/Net-SNMP_and_lm-sensors_on_Ubuntu_10.04