Skip to content

Commit 93eba37

Browse files
Adopt logging utilities from protocol (#305)
1 parent 38aea00 commit 93eba37

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/jfreymuth/oggvorbis v1.0.5
1313
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1
1414
github.com/livekit/mediatransportutil v0.0.0-20241220010243-a2bdee945564
15-
github.com/livekit/protocol v1.34.1-0.20250224104114-8819517840a7
15+
github.com/livekit/protocol v1.34.1-0.20250227175732-e8f463c43a44
1616
github.com/livekit/psrpc v0.6.1-0.20250205181828-a0beed2e4126
1717
github.com/livekit/server-sdk-go/v2 v2.5.0
1818
github.com/livekit/sipgo v0.13.2-0.20250130142851-36ed3228d934

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD
127127
github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
128128
github.com/livekit/mediatransportutil v0.0.0-20241220010243-a2bdee945564 h1:GX7KF/V9ExmcfT/2Bdia8aROjkxrgx7WpyH7w9MB4J4=
129129
github.com/livekit/mediatransportutil v0.0.0-20241220010243-a2bdee945564/go.mod h1:36s+wwmU3O40IAhE+MjBWP3W71QRiEE9SfooSBvtBqY=
130-
github.com/livekit/protocol v1.34.1-0.20250224104114-8819517840a7 h1:E/RfK+qOmqLU7CGpv0TYvIo3en39YR3jZm9pOpC2fO8=
131-
github.com/livekit/protocol v1.34.1-0.20250224104114-8819517840a7/go.mod h1:yXuQ7ucrLj91nbxL6/AHgtxdha1DGzLj1LkgvnT90So=
130+
github.com/livekit/protocol v1.34.1-0.20250227175732-e8f463c43a44 h1:Cr8s9Vwm72S6Wu0TAiFnuXopnjL/aA0JhNgsz3AH7CI=
131+
github.com/livekit/protocol v1.34.1-0.20250227175732-e8f463c43a44/go.mod h1:yXuQ7ucrLj91nbxL6/AHgtxdha1DGzLj1LkgvnT90So=
132132
github.com/livekit/psrpc v0.6.1-0.20250205181828-a0beed2e4126 h1:fzuYpAQbCid7ySPpQWWePfQOWUrs8x6dJ0T3Wl07n+Y=
133133
github.com/livekit/psrpc v0.6.1-0.20250205181828-a0beed2e4126/go.mod h1:X5WtEZ7OnEs72Fi5/J+i0on3964F1aynQpCalcgMqRo=
134134
github.com/livekit/server-sdk-go/v2 v2.5.0 h1:HCKm3f6PvefGp8emNC2mi9+9IXzBYrynuGbtUdp5u+w=

pkg/config/config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
"github.com/livekit/mediatransportutil/pkg/rtcconfig"
2828
"github.com/livekit/protocol/logger"
29+
"github.com/livekit/protocol/logger/medialogutils"
2930
"github.com/livekit/protocol/redis"
3031
"github.com/livekit/protocol/utils/guid"
3132
"github.com/livekit/psrpc"
@@ -161,7 +162,7 @@ func (c *Config) InitLogger(values ...interface{}) error {
161162
values = append(c.GetLoggerValues(), values...)
162163
l := zl.WithValues(values...)
163164
logger.SetLogger(l, c.ServiceName)
164-
lksdk.SetLogger(l)
165+
lksdk.SetLogger(medialogutils.NewOverrideLogger(nil))
165166

166167
return nil
167168
}

pkg/sip/room.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"github.com/livekit/protocol/livekit"
2727
"github.com/livekit/protocol/logger"
28+
"github.com/livekit/protocol/logger/medialogutils"
2829
"github.com/livekit/protocol/sip"
2930
lksdk "github.com/livekit/server-sdk-go/v2"
3031

@@ -259,7 +260,7 @@ func (r *Room) Connect(conf *config.Config, rconf RoomConfig) error {
259260
}
260261
}
261262
room := lksdk.NewRoom(roomCallback)
262-
room.SetLogger(r.log)
263+
room.SetLogger(medialogutils.NewOverrideLogger(r.log))
263264
err := room.JoinWithToken(rconf.WsUrl, rconf.Token, lksdk.WithAutoSubscribe(false))
264265
if err != nil {
265266
return err

0 commit comments

Comments
 (0)