|
|
@@ -52,6 +52,12 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
|
|
|
for {
|
|
|
_, msg, err := conn.ReadMessage()
|
|
|
if err != nil {
|
|
|
+ if websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseNoStatusReceived) {
|
|
|
+ config.Logger.Info("WS closed")
|
|
|
+ break
|
|
|
+ }
|
|
|
+ config.Logger.Error(fmt.Sprintf("Error reading websocket message: %v", err))
|
|
|
+ continue
|
|
|
}
|
|
|
var payload structs.WsPayload
|
|
|
// if it fails to marshal, assume that means no token
|
|
|
@@ -74,12 +80,12 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
|
|
|
if err != nil {
|
|
|
errmsg := fmt.Sprintf("Error marshalling token (init): %v", err)
|
|
|
config.Logger.Error(errmsg)
|
|
|
- continue
|
|
|
}
|
|
|
if err := conn.WriteMessage(websocket.TextMessage, respJson); err != nil {
|
|
|
config.Logger.Error(fmt.Sprintf("Error writing response: %v", err))
|
|
|
}
|
|
|
}
|
|
|
+ config.Logger.Info(fmt.Sprintf("Received message: %s", string(msg)))
|
|
|
var msgType structs.WsType
|
|
|
err = json.Unmarshal(msg, &msgType)
|
|
|
if err != nil {
|