summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2019-04-18 08:47:26 +0200
committernicolargo <nicolas@nicolargo.com>2019-04-18 08:47:26 +0200
commitdbc7b96e51a739f80e6231efb3182a4c5b073ee9 (patch)
treeb20d9f4fbb1942ff3ca7417be766543032662979
parent727042042a47702adedc567965fe223028a5cfc2 (diff)
parenta55092e7601ee39324acb5463bd0a9dd4b64f4c0 (diff)
Merge branch 'issue1469' into develop
-rw-r--r--NEWS3
-rw-r--r--glances/plugins/glances_ip.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index a1ca661f..0136bcd1 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,8 @@ Bugs corrected:
* 500 Internal Server Error /api/3/network/interface_name #1401
* Connection to MQTT server failed : getaddrinfo() argument 2 must be integer or string #1450
* `l` keypress (hide alert log) not working after some time #1449
- * Too less data using prometheus exporter #1462
+ * Too less data using prometheus exporter #1462
+ * Getting an error when running with prometheus exporter #1469
Others:
diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py
index 42c946fc..d678db8d 100644
--- a/glances/plugins/glances_ip.py
+++ b/glances/plugins/glances_ip.py
@@ -131,7 +131,8 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(msg))
try:
msg_pub = '{}'.format(self.stats['public_address'])
- except UnicodeEncodeError:
+ except (UnicodeEncodeError, KeyError):
+ # Add KeyError exception (see https://github.com/nicolargo/glances/issues/1469)
pass
else:
if self.stats['public_address'] is not None: