MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix websocket only responding to every-other request

Browse Source
This commit is contained in:
Dane Everitt 2019-09-08 18:03:39 -07:00
parent 437cc2bfd1
commit 0b4816b46f
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
websocket.go
View File

@ -9,7 +9,6 @@ import (
"github.com/pterodactyl/wings/config" "github.com/pterodactyl/wings/config"
"github.com/pterodactyl/wings/server" "github.com/pterodactyl/wings/server"
"go.uber.org/zap" "go.uber.org/zap"
"io/ioutil"
"net/http" "net/http"
"os" "os"
"strings" "strings"
@ -141,7 +140,8 @@ func (rt *Router) routeWebsocket(w http.ResponseWriter, r *http.Request, ps http
for { for {
j := WebsocketMessage{inbound: true} j := WebsocketMessage{inbound: true}
if _, _, err := c.ReadMessage(); err != nil { _, p, err := c.ReadMessage()
if err != nil {
if !websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseNoStatusReceived, websocket.CloseServiceRestart) { if !websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseNoStatusReceived, websocket.CloseServiceRestart) {
zap.S().Errorw("error handling websocket message", zap.Error(err)) zap.S().Errorw("error handling websocket message", zap.Error(err))
} }
@ -151,7 +151,7 @@ func (rt *Router) routeWebsocket(w http.ResponseWriter, r *http.Request, ps http
// Discard and JSON parse errors into the void and don't continue processing this // Discard and JSON parse errors into the void and don't continue processing this
// specific socket request. If we did a break here the client would get disconnected // specific socket request. If we did a break here the client would get disconnected
// from the socket, which is NOT what we want to do. // from the socket, which is NOT what we want to do.
if err := c.ReadJSON(&j); err != nil { if err := json.Unmarshal(p, &j); err != nil {
continue continue
} }