Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cookbook/websocket/net/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func hello(c *echo.Context) error {
// Read
msg := ""
if err := websocket.Message.Receive(ws, &msg); err != nil {
c.Logger().Error("failed to write WS message", "error", err)
c.Logger().Error("failed to read WS message", "error", err)
return
}
fmt.Printf("%s\n", msg)
Expand Down
5 changes: 2 additions & 3 deletions cookbook/websocket/net/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,19 @@ func TestHelloReturnsAfterClientDisconnect(t *testing.T) {
})

server := httptest.NewServer(e)
defer server.Close()

wsURL := "ws" + strings.TrimPrefix(server.URL, "http") + "/ws"
ws, err := websocket.Dial(wsURL, "", server.URL)
if err != nil {
server.Close()
t.Fatalf("failed to connect websocket client: %v", err)
}
if err := ws.Close(); err != nil {
server.CloseClientConnections()
t.Fatalf("failed to close websocket client: %v", err)
}

select {
case <-handlerReturned:
server.Close()
case <-time.After(2 * time.Second):
t.Fatal("websocket handler did not return after client disconnected")
}
Expand Down
Loading