@@ -73,14 +73,14 @@ func (c *connection) readPump() {
73
73
c .ws .SetReadLimit (maxMessageSize )
74
74
75
75
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" )
77
77
}
78
78
79
79
c .ws .SetPongHandler (func (string ) error {
80
80
deadline := tz .Now ().Add (pongWait )
81
81
82
82
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" )
84
84
}
85
85
86
86
return nil
@@ -92,7 +92,7 @@ func (c *connection) readPump() {
92
92
93
93
if err != nil {
94
94
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 " )
96
96
}
97
97
break
98
98
}
@@ -126,20 +126,20 @@ func (c *connection) writePump() {
126
126
127
127
if ! ok {
128
128
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 " )
130
130
}
131
131
return
132
132
}
133
133
134
134
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 " )
136
136
return
137
137
}
138
138
139
139
case <- ticker .C :
140
140
141
141
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 " )
143
143
return
144
144
}
145
145
}
@@ -156,10 +156,12 @@ func Handler(w http.ResponseWriter, r *http.Request) {
156
156
user := usr .(* db.User )
157
157
ws , err := upgrader .Upgrade (w , r , nil )
158
158
if err != nil {
159
+
159
160
log .WithError (err ).WithFields (log.Fields {
160
161
"context" : "websocket" ,
161
162
"user_id" : user .ID ,
162
- }).Error ("Cannot upgrade connection" )
163
+ }).Error ("Failed to upgrade connection to websocket" )
164
+
163
165
w .WriteHeader (http .StatusInternalServerError )
164
166
return
165
167
}
0 commit comments