diff --git a/cookbook/websocket/net/server.go b/cookbook/websocket/net/server.go index cbda78a3..dbdb34f1 100644 --- a/cookbook/websocket/net/server.go +++ b/cookbook/websocket/net/server.go @@ -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) diff --git a/cookbook/websocket/net/server_test.go b/cookbook/websocket/net/server_test.go index bc82da37..d7d61b55 100644 --- a/cookbook/websocket/net/server_test.go +++ b/cookbook/websocket/net/server_test.go @@ -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") }