summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2018-09-01 10:22:14 +0200
committernicolargo <nicolas@nicolargo.com>2018-09-01 10:22:14 +0200
commitcb643e4eb4b9d1db51eeb220a2d470b7d3bc67e4 (patch)
treeb8ea1390dbea8a198910f7689b696bd42021232d
parenta814caedc9b83b95ba57e6b97de71aa9644e5024 (diff)
parent963924be021f44dfd03f8f19a6a50c7e21a55f27 (diff)
Merge branch 'issue1292' into develop
-rw-r--r--NEWS1
-rw-r--r--glances/plugins/glances_hddtemp.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 17606531..257dc204 100644
--- a/NEWS
+++ b/NEWS
@@ -65,6 +65,7 @@ Bugs corrected:
* Glances crash with extended process stats #1283
* Terminal window stuck at the last accessed *protected* server #1275
* Glances shows mdadm RAID0 as degraded when chunksize=128k and the array isn't degraded. #1299
+ * Never starts in a server on Google Cloud and FreeBSD #1292
Backward-incompatible changes:
diff --git a/glances/plugins/glances_hddtemp.py b/glances/plugins/glances_hddtemp.py
index 6e24f0cb..2894e68b 100644
--- a/glances/plugins/glances_hddtemp.py
+++ b/glances/plugins/glances_hddtemp.py
@@ -141,7 +141,7 @@ class GlancesGrabHDDTemp(object):
if not received:
break
data += received
- except socket.error as e:
+ except Exception as e:
logger.debug("Cannot connect to an HDDtemp server ({}:{} => {})".format(self.host, self.port, e))
logger.debug("Disable the HDDtemp module. Use the --disable-hddtemp to hide the previous message.")
if self.args is not None: