summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolargo <nicolas@nicolargo.com>2014-06-21 15:10:50 +0200
committerNicolargo <nicolas@nicolargo.com>2014-06-21 15:10:50 +0200
commit06e845e508b0b8812975f3a34d28374794b310a4 (patch)
tree1c48d3c0d89fa2cf245d9ec6271ac63104c2c0e3
parent07611c073067468fdb715ddd2d55ce54cfdfe75c (diff)
parenta0a7509709cf127a6edd55a222a3c45e06889380 (diff)
Merge branch 'hotfix/issue375'
-rw-r--r--glances/core/glances_client.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/glances/core/glances_client.py b/glances/core/glances_client.py
index d2b05d97..27fdeeae 100644
--- a/glances/core/glances_client.py
+++ b/glances/core/glances_client.py
@@ -24,9 +24,9 @@ import json
import socket
import sys
try:
- from xmlrpc.client import ServerProxy, ProtocolError
+ from xmlrpc.client import ServerProxy, ProtocolError, Fault
except ImportError: # Python 2
- from xmlrpclib import ServerProxy, ProtocolError
+ from xmlrpclib import ServerProxy, ProtocolError, Fault
# Import Glances libs
from glances.core.glances_globals import version
@@ -150,6 +150,9 @@ class GlancesClient(object):
except socket.error:
# Client cannot get server stats
return "Disconnected"
+ except Fault:
+ # Client cannot get server stats (issue #375)
+ return "Disconnected"
else:
# Put it in the internal dict
self.stats.update(server_stats)