From 55500b573a5c1197bc4f06794fbf862979addd58 Mon Sep 17 00:00:00 2001 From: Seiya Homma <99792735+Honsei901@users.noreply.github.com> Date: Thu, 12 Dec 2024 20:19:23 +0900 Subject: [PATCH] [MM-61776] Fix errcheck issues in server/channels/app/platform/web_conn.go (#29515) --- server/.golangci.yml | 1 - server/channels/app/platform/web_conn.go | 14 +++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index e150ec2418..ca36e47afe 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -101,7 +101,6 @@ issues: channels/app/platform/session.go|\ channels/app/platform/status.go|\ channels/app/platform/web_broadcast_hook.go|\ - channels/app/platform/web_conn.go|\ channels/app/platform/web_hub.go|\ channels/app/platform/web_hub_test.go|\ channels/app/plugin_test.go|\ diff --git a/server/channels/app/platform/web_conn.go b/server/channels/app/platform/web_conn.go index ff326c3100..89e2ce5c90 100644 --- a/server/channels/app/platform/web_conn.go +++ b/server/channels/app/platform/web_conn.go @@ -437,7 +437,11 @@ func (wc *WebConn) readPump() { } wc.WebSocket.SetReadLimit(model.SocketMaxMessageSizeKb) - wc.WebSocket.SetReadDeadline(time.Now().Add(pongWaitTime)) + err := wc.WebSocket.SetReadDeadline(time.Now().Add(pongWaitTime)) + if err != nil { + wc.logSocketErr("websocket.SetReadDeadline", err) + return + } wc.WebSocket.SetPongHandler(func(string) error { if err := wc.WebSocket.SetReadDeadline(time.Now().Add(pongWaitTime)); err != nil { return err @@ -551,7 +555,9 @@ func (wc *WebConn) writePump() { select { case msg, ok := <-wc.send: if !ok { - wc.writeMessageBuf(websocket.CloseMessage, []byte{}) + if err := wc.writeMessageBuf(websocket.CloseMessage, []byte{}); err != nil { + wc.logSocketErr("websocket.send", err) + } return } @@ -620,7 +626,9 @@ func (wc *WebConn) writePump() { // writeMessageBuf is a helper utility that wraps the write to the socket // along with setting the write deadline. func (wc *WebConn) writeMessageBuf(msgType int, data []byte) error { - wc.WebSocket.SetWriteDeadline(time.Now().Add(writeWaitTime)) + if err := wc.WebSocket.SetWriteDeadline(time.Now().Add(writeWaitTime)); err != nil { + return err + } return wc.WebSocket.WriteMessage(msgType, data) }