Better logging

client/helper_test.go

@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"log/slog"
 	"os"
 	"testing"
 	"time"
@@ -45,7 +46,7 @@ const (
 	userPass    = "U$er-sample1"
 	teamName    = "calls"
 	nChannels   = 2
-	waitTimeout = 5 * time.Second
+	waitTimeout = 10 * time.Second
 )
 
 func (th *TestHelper) newScreenTrack(mimeType string) *webrtc.TrackLocalStaticRTP {
@@ -326,6 +327,11 @@ func setupTestHelper(tb testing.TB, channelName string) *TestHelper {
 	tb.Helper()
 	var err error
 
+	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
+		AddSource: true,
+		Level:     slog.LevelDebug,
+	}))
+
 	th := &TestHelper{
 		tb:       tb,
 		channels: make(map[string]*model.Channel),
@@ -354,15 +360,15 @@ func setupTestHelper(tb testing.TB, channelName string) *TestHelper {
 		SiteURL:   th.apiURL,
 		AuthToken: th.adminAPIClient.AuthToken,
 		ChannelID: channelID,
-	})
+	}, WithLogger(logger))
 	require.NoError(tb, err)
 	require.NotNil(tb, th.adminClient)
 
 	th.userClient, err = New(Config{
 		SiteURL:   th.apiURL,
 		AuthToken: th.userAPIClient.AuthToken,
 		ChannelID: channelID,
-	})
+	}, WithLogger(logger))
 	require.NoError(tb, err)
 	require.NotNil(tb, th.userClient)
 

client/websocket.go

@@ -111,14 +111,14 @@ func (c *Client) handleWSEventHello(ev *model.WebSocketEvent) (isReconnect bool,
 	}
 
 	if connID != c.currentConnID {
-		c.log.Debug("new connection id from server")
+		c.log.Debug("new connection id from server", slog.String("connID", connID))
 	}
 
 	if c.originalConnID == "" {
-		c.log.Debug("initial ws connection")
+		c.log.Debug("initial ws connection", slog.String("originalConnID", connID))
 		c.originalConnID = connID
 	} else {
-		c.log.Debug("ws reconnected successfully")
+		c.log.Debug("ws reconnected successfully", slog.String("originalConnID", c.originalConnID))
 		c.wsLastDisconnect = time.Time{}
 		c.wsReconnectInterval = 0
 		isReconnect = true