Skip to content

Commit 5ddec50

Browse files
seans3k8s-publishing-bot
authored andcommitted
removes extra upgrade aware proxy logging; returns tunneling connection close error
Kubernetes-commit: e8bbb221d36f1adf4116752990c0c4f17a9e5deb
1 parent 808e708 commit 5ddec50

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

pkg/util/proxy/upgradeaware.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ func (h *UpgradeAwareHandler) tryUpgrade(w http.ResponseWriter, req *http.Reques
422422
} else {
423423
writer = backendConn
424424
}
425-
_, err := io.Copy(writer, &loggingReader{name: "client->backend", delegate: requestHijackedConn})
425+
_, err := io.Copy(writer, requestHijackedConn)
426426
if err != nil && !strings.Contains(err.Error(), "use of closed network connection") {
427427
klog.Errorf("Error proxying data from client to backend: %v", err)
428428
}
@@ -436,7 +436,7 @@ func (h *UpgradeAwareHandler) tryUpgrade(w http.ResponseWriter, req *http.Reques
436436
} else {
437437
reader = backendConn
438438
}
439-
_, err := io.Copy(requestHijackedConn, &loggingReader{name: "backend->client", delegate: reader})
439+
_, err := io.Copy(requestHijackedConn, reader)
440440
if err != nil && !strings.Contains(err.Error(), "use of closed network connection") {
441441
klog.Errorf("Error proxying data from backend to client: %v", err)
442442
}
@@ -454,18 +454,6 @@ func (h *UpgradeAwareHandler) tryUpgrade(w http.ResponseWriter, req *http.Reques
454454
return true
455455
}
456456

457-
// loggingReader logs the bytes read from the "delegate" with a "name" prefix.
458-
type loggingReader struct {
459-
name string
460-
delegate io.Reader
461-
}
462-
463-
func (l *loggingReader) Read(p []byte) (int, error) {
464-
n, err := l.delegate.Read(p)
465-
klog.V(8).Infof("%s: %d bytes, err=%v, bytes=% X", l.name, n, err, p[:n])
466-
return n, err
467-
}
468-
469457
// FIXME: Taken from net/http/httputil/reverseproxy.go as singleJoiningSlash is not exported to be re-used.
470458
// See-also: https://github.com/golang/go/issues/44290
471459
func singleJoiningSlash(a, b string) string {

0 commit comments

Comments
 (0)