From 13c0b62f96a6b59c586b762bd0959d65379417c0 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 29 Jun 2015 15:03:52 +0100
Subject: [PATCH] When looking at proxy logs, use both stderr and stdout

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

diff --git a/weave b/weave
index 39edfa75..7d4c9f58 100755
--- a/weave
+++ b/weave
@@ -614,7 +614,7 @@ wait_for_status() {
 wait_for_log() {
     fifo=/tmp/tmpfifo.$$
     mkfifo $fifo || exit 1
-    docker logs -f $1 2>/dev/null >$fifo &
+    docker logs -f $1 >$fifo 2>&1 &
     res=0
     grep -q "$2" $fifo || res=1
     kill $! 2>/dev/null || true
@@ -927,7 +927,7 @@ proxy_args() {
 }
 
 proxy_addr() {
-    if addr=$(docker logs $PROXY_CONTAINER_NAME 2>/dev/null | head -n3 | grep -oE "proxy listening on .*"); then
+    if addr=$(docker logs $PROXY_CONTAINER_NAME 2>&1 | head -n3 | grep -oE "proxy listening on .*"); then
       echo "${1}${addr##* }" | sed "s/0.0.0.0/$PROXY_HOST/g"
       return 0
     fi