replace proxy /weave endpoint with /status

which is more standard with others, and doesn't conflict with docker api
This commit is contained in:
Paul Bellamy committed 2015-05-29 15:48:33 +01:00
1 parent 6e2bb075a6
commit 2be69634df
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -559,7 +559,7 @@ wait_for_status_ip() {
WAIT_TIME=0
while [ $WAIT_TIME -lt 3 ]; do
sleep $WAIT_TIME
http_call_ip $1 $2 GET ${3:-/status} >/dev/null && return 0
http_call_ip $1 $2 GET /status >/dev/null && return 0
WAIT_TIME=$((WAIT_TIME+1))
done
echo "Timed out waiting for container to start." >&2
@@ -866,7 +866,7 @@ case "$COMMAND" in
$WEAVEPROXY_DOCKER_ARGS \
$EXEC_IMAGE "$@")
wait_for_status_ip $PROXY_HOST $PROXY_PORT /weave
wait_for_status_ip $PROXY_HOST $PROXY_PORT
echo $PROXY_CONTAINER
;;
connect)