Skip to content

Commit b69fe05

Browse files
committed
fix(websocket): replace websocket error handling with helper function
1 parent fb179f4 commit b69fe05

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

api/cluster/websocket.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/0xJacky/Nginx-UI/internal/analytic"
1313
"github.com/0xJacky/Nginx-UI/internal/kernel"
14+
"github.com/0xJacky/Nginx-UI/internal/helper"
1415
"github.com/0xJacky/Nginx-UI/model"
1516
"github.com/gin-gonic/gin"
1617
"github.com/gorilla/websocket"
@@ -286,10 +287,10 @@ func (c *Client) readPump() {
286287
for {
287288
_, _, err := c.conn.ReadMessage()
288289
if err != nil {
289-
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) {
290+
if helper.IsUnexpectedWebsocketError(err) {
290291
logger.Error("Websocket error:", err)
291292
}
292-
break
293+
return
293294
}
294295
}
295296
}()

api/nginx_log/websocket.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func handleLogControl(ws *websocket.Conn, controlChan chan controlStruct, errCha
146146

147147
for {
148148
msgType, payload, err := ws.ReadMessage()
149-
if err != nil && websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) {
149+
if err != nil && helper.IsUnexpectedWebsocketError(err) {
150150
errChan <- errors.Wrap(err, "error handleLogControl read message")
151151
return
152152
}

0 commit comments

Comments
 (0)