Skip to content

Commit e323091

Browse files
committed
actually added logging early to test early logging
1 parent 0b1122d commit e323091

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

coderd/httpmw/logger_internal_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"net/http"
66
"net/http/httptest"
7-
"sync"
87
"testing"
98
"time"
109

@@ -96,16 +95,17 @@ func TestLoggerMiddleware_WebSocket(t *testing.T) {
9695
sink := &fakeSink{}
9796
logger := slog.Make(sink)
9897
logger = logger.Leveled(slog.LevelDebug)
99-
var wg sync.WaitGroup
98+
10099
// Create a test handler to simulate a WebSocket connection
101100
testHandler := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
102101
conn, err := websocket.Accept(rw, r, nil)
103102
if err != nil {
104103
t.Errorf("failed to accept websocket: %v", err)
105104
return
106105
}
106+
requestLgr := RequestLoggerFromContext(r.Context())
107+
requestLgr.WriteLog(r.Context(), http.StatusSwitchingProtocols)
107108
defer conn.Close(websocket.StatusNormalClosure, "")
108-
defer wg.Done()
109109

110110
// Send a couple of messages for testing
111111
_ = conn.Write(ctx, websocket.MessageText, []byte("ping"))
@@ -125,10 +125,8 @@ func TestLoggerMiddleware_WebSocket(t *testing.T) {
125125
// Create a test HTTP request
126126
srv := httptest.NewServer(customHandler)
127127
defer srv.Close()
128-
wg.Add(1)
129128
// nolint: bodyclose
130129
conn, _, err := websocket.Dial(ctx, srv.URL, nil)
131-
wg.Wait()
132130
if err != nil {
133131
t.Fatalf("failed to create WebSocket connection: %v", err)
134132
}

0 commit comments

Comments
 (0)