Merge branch 'master' of github.com:zalando/spilo

zalando · Sep 9, 2015 · f7c99ec · f7c99ec
2 parents 22c920e + dbba063
commit f7c99ec
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/etcd-cluster-appliance/etcd.py b/etcd-cluster-appliance/etcd.py
@@ -388,8 +388,9 @@ def members_changed(self):
         return changed
 
     def cluster_unhealthy(self):
-        process = subprocess.Popen([self.manager.ETCD_BINARY + 'ctl', 'cluster-health'], stdout=subprocess.PIPE)
-        ret = any([True for line in process.stdout if 'is unhealthy' in str(line)])
+        process = subprocess.Popen([self.manager.ETCD_BINARY + 'ctl', 'cluster-health'],
+                                   stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        ret = any([True for line in process.stdout if 'is unhealthy' in str(line) or 'is unreachable' in str(line)])
         process.wait()
         return ret