From 2e7c281b46846c4b5203ac6c83cf2683685928ad Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 18 Mar 2015 16:46:51 +0000 Subject: [PATCH] Weave status returns success irrespective of whether router or DNS up --- weave | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/weave b/weave index a33bc111..e73058f1 100755 --- a/weave +++ b/weave @@ -555,10 +555,9 @@ case "$COMMAND" in http_call $CONTAINER_NAME $HTTP_PORT POST /connect -d "peer=$1" ;; status) - if http_call $CONTAINER_NAME $HTTP_PORT GET /status; then ROUTER_UP=true; else ROUTER_UP=false; fi + http_call $CONTAINER_NAME $HTTP_PORT GET /status || true echo - if http_call $DNS_CONTAINER_NAME $DNS_HTTP_PORT GET /status; then DNS_UP=true; else DNS_UP=false; fi - $ROUTER_UP && $DNS_UP + http_call $DNS_CONTAINER_NAME $DNS_HTTP_PORT GET /status || true ;; ps) [ $# -eq 0 ] || usage