homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix logger in Oxy

Browse source
This commit is contained in:
Ludovic Fernandez 2018-09-24 10:04:03 +02:00 • committed by Traefiker Bot
parent 38d655636d
commit 1f1ecb15f6
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gopkg.lock generated
View file

@ -1298,7 +1298,7 @@
"roundrobin", "roundrobin",
"utils" "utils"
] ]
revision = "77148e9694210e5f5610328f1cd7cf65583014c2" revision = "fe51048067db50958154cd4040da878b10002a3a"
[[projects]] [[projects]]
name = "github.com/vulcand/predicate" name = "github.com/vulcand/predicate"

6
vendor/github.com/vulcand/oxy/buffer/buffer.go generated vendored
View file

@ -216,7 +216,7 @@ func (b *Buffer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
} }
if err := b.checkLimit(req); err != nil { 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) b.errHandler.ServeHTTP(w, req, err)
return return
} }
@ -239,7 +239,7 @@ func (b *Buffer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
if body != nil { if body != nil {
errClose := body.Close() errClose := body.Close()
if errClose != nil { 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 return conn, rw, err
} }
b.log.Warningf("Upstream ResponseWriter of type %v does not implement http.Hijacker. Returning dummy channel.", reflect.TypeOf(b.responseWriter)) 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 // SizeErrHandler Size error handler

4
vendor/github.com/vulcand/oxy/cbreaker/fallback.go generated vendored
View file

@ -51,7 +51,7 @@ func (f *ResponseFallback) ServeHTTP(w http.ResponseWriter, req *http.Request) {
w.WriteHeader(f.r.StatusCode) w.WriteHeader(f.r.StatusCode)
_, err := w.Write(f.r.Body) _, err := w.Write(f.r.Body)
if err != nil { 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) w.WriteHeader(http.StatusFound)
_, err := w.Write([]byte(http.StatusText(http.StatusFound))) _, err := w.Write([]byte(http.StatusText(http.StatusFound)))
if err != nil { 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)
} }
} }

10
vendor/github.com/vulcand/oxy/forward/fwd.go generated vendored
View file

@ -349,17 +349,17 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request,
if resp == nil { if resp == nil {
ctx.errHandler.ServeHTTP(w, req, err) ctx.errHandler.ServeHTTP(w, req, err)
} else { } 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) hijacker, ok := w.(http.Hijacker)
if !ok { 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) ctx.errHandler.ServeHTTP(w, req, err)
return return
} }
conn, _, errHijack := hijacker.Hijack() conn, _, errHijack := hijacker.Hijack()
if errHijack != nil { 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) ctx.errHandler.ServeHTTP(w, req, errHijack)
return return
} }
@ -367,7 +367,7 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request,
errWrite := resp.Write(conn) errWrite := resp.Write(conn)
if errWrite != nil { 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) ctx.errHandler.ServeHTTP(w, req, errWrite)
return return
} }
@ -385,7 +385,7 @@ func (f *httpForwarder) serveWebSocket(w http.ResponseWriter, req *http.Request,
underlyingConn, err := upgrader.Upgrade(w, req, resp.Header) underlyingConn, err := upgrader.Upgrade(w, req, resp.Header)
if err != nil { 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 return
} }
defer func() { defer func() {