removes extra upgrade aware proxy logging; returns tunneling connection close error

Kubernetes-commit: e8bbb221d36f1adf4116752990c0c4f17a9e5deb
This commit is contained in:
Sean Sullivan 2024-03-02 16:10:39 -08:00 committed by Kubernetes Publisher
parent 271d034e86
commit 79f21dcaa8

View File

@ -114,8 +114,13 @@ func (c *TunnelingConnection) Close() error {
klog.V(7).Infof("%s: tunneling connection Close()...", c.name)
// Signal other endpoint that websocket connection is closing; ignore error.
normalCloseMsg := gwebsocket.FormatCloseMessage(gwebsocket.CloseNormalClosure, "")
c.conn.WriteControl(gwebsocket.CloseMessage, normalCloseMsg, time.Now().Add(time.Second)) //nolint:errcheck
err = c.conn.Close()
writeControlErr := c.conn.WriteControl(gwebsocket.CloseMessage, normalCloseMsg, time.Now().Add(time.Second))
closeErr := c.conn.Close()
if closeErr != nil {
err = closeErr
} else if writeControlErr != nil {
err = writeControlErr
}
})
return err
}