Restore sending close message before closing

And simplify EOF check.
This commit is contained in:
Arlo Breault 2019-11-11 16:59:33 -05:00
parent c417fd5599
commit abefae1587

View file

@ -77,12 +77,10 @@ func (conn *webSocketConn) Read(b []byte) (n int, err error) {
}
n, err = conn.r.Read(b)
if err != nil {
if err == io.EOF {
// Message finished
conn.r = nil
err = nil
}
if err == io.EOF {
// Message finished
conn.r = nil
err = nil
}
return
}
@ -102,6 +100,8 @@ func (conn *webSocketConn) Write(b []byte) (n int, err error) {
// Implements io.Closer.
func (conn *webSocketConn) Close() error {
// Ignore any error in trying to write a Close frame.
_ = conn.Ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(time.Second))
return conn.Ws.Close()
}