diff --git a/Gopkg.lock b/Gopkg.lock index 10f86227c..fe8ee8cd4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1298,7 +1298,7 @@ "roundrobin", "utils" ] - revision = "77148e9694210e5f5610328f1cd7cf65583014c2" + revision = "fe51048067db50958154cd4040da878b10002a3a" [[projects]] name = "github.com/vulcand/predicate" diff --git a/vendor/github.com/vulcand/oxy/buffer/buffer.go b/vendor/github.com/vulcand/oxy/buffer/buffer.go index 68b387925..08eb8b3e7 100644 --- a/vendor/github.com/vulcand/oxy/buffer/buffer.go +++ b/vendor/github.com/vulcand/oxy/buffer/buffer.go @@ -216,7 +216,7 @@ func (b *Buffer) ServeHTTP(w http.ResponseWriter, req *http.Request) { } if err := b.checkLimit(req); err != nil { - log.Errorf("vulcand/oxy/buffer: request body over limit, err: %v", err) + b.log.Errorf("vulcand/oxy/buffer: request body over limit, err: %v", err) b.errHandler.ServeHTTP(w, req, err) return } @@ -239,7 +239,7 @@ func (b *Buffer) ServeHTTP(w http.ResponseWriter, req *http.Request) { if body != nil { errClose := body.Close() if errClose != nil { - log.Errorf("vulcand/oxy/buffer: failed to close body, err: %v", errClose) + b.log.Errorf("vulcand/oxy/buffer: failed to close body, err: %v", errClose) } } }() @@ -417,7 +417,7 @@ func (b *bufferWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) { return conn, rw, err } b.log.Warningf("Upstream ResponseWriter of type %v does not implement http.Hijacker. Returning dummy channel.", reflect.TypeOf(b.responseWriter)) - return nil, nil, fmt.Errorf("the response writer wrapped in this proxy does not implement http.Hijacker. Its type is: %v”", reflect.TypeOf(b.responseWriter)) + return nil, nil, fmt.Errorf("the response writer wrapped in this proxy does not implement http.Hijacker. Its type is: %v", reflect.TypeOf(b.responseWriter)) } // SizeErrHandler Size error handler diff --git a/vendor/github.com/vulcand/oxy/cbreaker/fallback.go b/vendor/github.com/vulcand/oxy/cbreaker/fallback.go index ea0655311..5c24548da 100644 --- a/vendor/github.com/vulcand/oxy/cbreaker/fallback.go +++ b/vendor/github.com/vulcand/oxy/cbreaker/fallback.go @@ -51,7 +51,7 @@ func (f *ResponseFallback) ServeHTTP(w http.ResponseWriter, req *http.Request) { w.WriteHeader(f.r.StatusCode) _, err := w.Write(f.r.Body) if err != nil { - log.Errorf("vulcand/oxy/fallback/response: failed to write response, err: %v", err) + f.log.Errorf("vulcand/oxy/fallback/response: failed to write response, err: %v", err) } } @@ -100,6 +100,6 @@ func (f *RedirectFallback) ServeHTTP(w http.ResponseWriter, req *http.Request) { w.WriteHeader(http.StatusFound) _, err := w.Write([]byte(http.StatusText(http.StatusFound))) if err != nil { - log.Errorf("vulcand/oxy/fallback/redirect: failed to write response, err: %v", err) + f.log.Errorf("vulcand/oxy/fallback/redirect: failed to write response, err: %v", err) } } diff --git a/vendor/github.com/vulcand/oxy/forward/fwd.go b/vendor/github.com/vulcand/oxy/forward/fwd.go index 5a8e81c77..e81ee89c2 100644 --- a/vendor/github.com/vulcand/oxy/forward/fwd.go +++ b/vendor/github.com/vulcand/oxy/forward/fwd.go @@ -349,17 +349,17 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request, if resp == nil { ctx.errHandler.ServeHTTP(w, req, err) } else { - log.Errorf("vulcand/oxy/forward/websocket: Error dialing %q: %v with resp: %d %s", outReq.Host, err, resp.StatusCode, resp.Status) + f.log.Errorf("vulcand/oxy/forward/websocket: Error dialing %q: %v with resp: %d %s", outReq.Host, err, resp.StatusCode, resp.Status) hijacker, ok := w.(http.Hijacker) if !ok { - log.Errorf("vulcand/oxy/forward/websocket: %s can not be hijack", reflect.TypeOf(w)) + f.log.Errorf("vulcand/oxy/forward/websocket: %s can not be hijack", reflect.TypeOf(w)) ctx.errHandler.ServeHTTP(w, req, err) return } conn, _, errHijack := hijacker.Hijack() if errHijack != nil { - log.Errorf("vulcand/oxy/forward/websocket: Failed to hijack responseWriter") + f.log.Errorf("vulcand/oxy/forward/websocket: Failed to hijack responseWriter") ctx.errHandler.ServeHTTP(w, req, errHijack) return } @@ -367,7 +367,7 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request, errWrite := resp.Write(conn) if errWrite != nil { - log.Errorf("vulcand/oxy/forward/websocket: Failed to forward response") + f.log.Errorf("vulcand/oxy/forward/websocket: Failed to forward response") ctx.errHandler.ServeHTTP(w, req, errWrite) return } @@ -385,7 +385,7 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request, underlyingConn, err := upgrader.Upgrade(w, req, resp.Header) if err != nil { - log.Errorf("vulcand/oxy/forward/websocket: Error while upgrading connection : %v", err) + f.log.Errorf("vulcand/oxy/forward/websocket: Error while upgrading connection : %v", err) return } defer func() {