From 934ec2467d69ea4105f125012280bcc34ddcac0f Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 4 Apr 2016 13:51:27 +0100
Subject: [PATCH] Eliminate race from call_weave; call check_running only after
 curl fails

---
 weave | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/weave b/weave
index 6d8c0148..7e725524 100755
--- a/weave
+++ b/weave
@@ -1080,8 +1080,14 @@ http_call_unix() {
 }
 
 call_weave() {
-    check_running $CONTAINER_NAME || return 1
-    http_call $HTTP_ADDR "$@"
+    TMPERR=/tmp/call_weave_err_$$
+    retval=0
+    http_call $HTTP_ADDR "$@" 2>$TMPERR || retval=$?
+    if [ $retval -ne 0 ] ; then
+        check_running $CONTAINER_NAME && cat $TMPERR >&2
+    fi
+    rm -f $TMPERR
+    return $retval
 }
 
 death_msg() {