summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Hennion <nicolashennion@gmail.com>2015-09-16 11:02:38 +0200
committerNicolas Hennion <nicolashennion@gmail.com>2015-09-16 11:02:38 +0200
commit39ece09226e652781caba637fe3bd1a74a8f2e80 (patch)
tree93243c5d4d4ea2c3dabc694a9cf604db9c419496
parent792026f41e6d0c19f6cedb362656f9d4a4d682d3 (diff)
parent84af87f647b344e7a6d34149a2af4bdbbbe7cf74 (diff)
Merge pull request #680 from TomasTomecek/docker-containers-can-be-none2
tback: docker.containers() can return None
-rw-r--r--glances/plugins/glances_docker.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py
index 26b81905..febbe37e 100644
--- a/glances/plugins/glances_docker.py
+++ b/glances/plugins/glances_docker.py
@@ -190,7 +190,7 @@ class Plugin(GlancesPlugin):
# Update current containers list
try:
- self.stats['containers'] = self.docker_client.containers()
+ self.stats['containers'] = self.docker_client.containers() or []
except Exception as e:
logger.error("{} plugin - Can not get containers list ({})".format(self.plugin_name, e))
return self.stats