Skip to content

Commit 7c20a86

Browse files
committed
feat(websocket): improve log messages
1 parent 1721e5d commit 7c20a86

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

api/sockets/handler.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ func (c *connection) readPump() {
7373
c.ws.SetReadLimit(maxMessageSize)
7474

7575
if err := c.ws.SetReadDeadline(tz.Now().Add(pongWait)); err != nil {
76-
c.logWarn(err, "Cannot set read deadline")
76+
c.logWarn(err, "Failed to set read deadline")
7777
}
7878

7979
c.ws.SetPongHandler(func(string) error {
8080
deadline := tz.Now().Add(pongWait)
8181

8282
if err := c.ws.SetReadDeadline(deadline); err != nil {
83-
c.logWarn(err, "Cannot set read deadline")
83+
c.logWarn(err, "Failed to set read deadline")
8484
}
8585

8686
return nil
@@ -92,7 +92,7 @@ func (c *connection) readPump() {
9292

9393
if err != nil {
9494
if websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway) {
95-
c.logDebug(err, "Cannot read message from websocket")
95+
c.logDebug(err, "Failed to read message from client")
9696
}
9797
break
9898
}
@@ -126,20 +126,20 @@ func (c *connection) writePump() {
126126

127127
if !ok {
128128
if err := c.write(websocket.CloseMessage, []byte{}); err != nil {
129-
c.logDebug(err, "Cannot send close message")
129+
c.logDebug(err, "Failed to write close message to client")
130130
}
131131
return
132132
}
133133

134134
if err := c.write(websocket.TextMessage, message); err != nil {
135-
c.logDebug(err, "Cannot send message")
135+
c.logDebug(err, "Failed to write message to client")
136136
return
137137
}
138138

139139
case <-ticker.C:
140140

141141
if err := c.write(websocket.PingMessage, []byte{}); err != nil {
142-
c.logDebug(err, "Cannot send ping message")
142+
c.logDebug(err, "Failed to write ping message to client")
143143
return
144144
}
145145
}
@@ -156,10 +156,12 @@ func Handler(w http.ResponseWriter, r *http.Request) {
156156
user := usr.(*db.User)
157157
ws, err := upgrader.Upgrade(w, r, nil)
158158
if err != nil {
159+
159160
log.WithError(err).WithFields(log.Fields{
160161
"context": "websocket",
161162
"user_id": user.ID,
162-
}).Error("Cannot upgrade connection")
163+
}).Error("Failed to upgrade connection to websocket")
164+
163165
w.WriteHeader(http.StatusInternalServerError)
164166
return
165167
}

0 commit comments

Comments
 (0)