When looking at proxy logs, use both stderr and stdout

This commit is contained in:
Bryan Boreham committed 2015-07-01 12:26:23 +01:00
1 parent 7276fc1d4b
commit 13c0b62f96
1 file changed
+2 -2
+2 -2
View File
@@ -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