From 255803e339e617e904fb05b12be7dcb89aa5e668 Mon Sep 17 00:00:00 2001 From: Tong Jia Date: Tue, 20 Feb 2018 09:42:14 -0500 Subject: [PATCH] improved error handling --- websocketproxy.go | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/websocketproxy.go b/websocketproxy.go index 5a47b3b..88d17e1 100644 --- a/websocketproxy.go +++ b/websocketproxy.go @@ -2,6 +2,7 @@ package websocketproxy import ( + "fmt" "log" "net" "net/http" @@ -160,29 +161,42 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) { } defer connPub.Close() - errc := make(chan error, 2) - - replicateWebsocketConn := func(dst, src *websocket.Conn, dstName, srcName string) { - var err error + errClient := make(chan error, 1) + errBackend := make(chan error, 1) + replicateWebsocketConn := func(dst, src *websocket.Conn, errc chan error) { for { msgType, msg, err := src.ReadMessage() if err != nil { - log.Printf("websocketproxy: error when copying from %s to %s using ReadMessage: %v", srcName, dstName, err) + m := websocket.FormatCloseMessage(websocket.CloseNormalClosure, fmt.Sprintf("%v", err)) + if e, ok := err.(*websocket.CloseError); ok { + if e.Code != websocket.CloseNoStatusReceived { + m = websocket.FormatCloseMessage(e.Code, e.Text) + } + } + errc <- err + dst.WriteMessage(websocket.CloseMessage, m) break } err = dst.WriteMessage(msgType, msg) if err != nil { - log.Printf("websocketproxy: error when copying from %s to %s using WriteMessage: %v", srcName, dstName, err) + errc <- err break - } else { - log.Printf("websocketproxy: copying from %s to %s completed without error.", srcName, dstName) } } - errc <- err } - go replicateWebsocketConn(connPub, connBackend, "client", "backend") - go replicateWebsocketConn(connBackend, connPub, "backend", "client") + go replicateWebsocketConn(connPub, connBackend, errClient) + go replicateWebsocketConn(connBackend, connPub, errBackend) + + var message string + select { + case err = <-errClient: + message = "websocketproxy: Error when copying from backend to client: %v" + case err = <-errBackend: + message = "websocketproxy: Error when copying from client to backend: %v" - <-errc + } + if e, ok := err.(*websocket.CloseError); !ok || e.Code == websocket.CloseAbnormalClosure { + log.Printf(message, err) + } }