From a3974c2aeb006726bbc0ae5bcb8d5e62d7028f1e Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 20 Jan 2016 14:24:28 +0000 Subject: [PATCH 1/2] Abort inspect exec rewrite unless Containers node is present --- proxy/inspect_exec_interceptor.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/proxy/inspect_exec_interceptor.go b/proxy/inspect_exec_interceptor.go index 32e70940..7b5a2cf8 100644 --- a/proxy/inspect_exec_interceptor.go +++ b/proxy/inspect_exec_interceptor.go @@ -22,6 +22,10 @@ func (i *inspectExecInterceptor) InterceptResponse(r *http.Response) error { return err } + if _, ok := exec["Container"]; !ok { + return nil + } + container, err := exec.Object("Container") if err != nil { return err From 14944da396327abc94d7c20c8079d94992f33d8e Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Wed, 20 Jan 2016 14:24:59 +0000 Subject: [PATCH 2/2] Ignore stderr in proxy_addrs --- weave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weave b/weave index 7e98cb51..7c99048a 100755 --- a/weave +++ b/weave @@ -1476,7 +1476,7 @@ proxy_args() { } proxy_addrs() { - if addr="$(http_call_unix $PROXY_CONTAINER_NAME status.sock GET /status 2>&1)" ; then + if addr="$(http_call_unix $PROXY_CONTAINER_NAME status.sock GET /status 2>/dev/null)" ; then echo "$addr" | sed "s/0.0.0.0/$PROXY_HOST/g" else