dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-08-28 11:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter unused candidate and refine log (#528)

Browse Source 
* filter unused candidate and refine log

* fix test
This commit is contained in:
cnderrauber
2022-03-18 12:57:33 +08:00
committed by GitHub
parent 64f82a6a73
commit 832f3fd124
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtc/participant.go
+4 -4
View File
@@ -160,7 +160,7 @@ func NewParticipant(params ParticipantParams, perms *livekit.ParticipantPermissi
CongestionControlConfig: params.CongestionControlConfig,
Telemetry: p.params.Telemetry,
EnabledCodecs: p.params.EnabledCodecs,
Logger: params.Logger,
Logger: LoggerWithPCTarget(params.Logger, livekit.SignalTarget_PUBLISHER),
SimTracks: params.SimTracks,
})
if err != nil {
@@ -175,7 +175,7 @@ func NewParticipant(params ParticipantParams, perms *livekit.ParticipantPermissi
CongestionControlConfig: params.CongestionControlConfig,
Telemetry: p.params.Telemetry,
EnabledCodecs: p.params.EnabledCodecs,
Logger: params.Logger,
Logger: LoggerWithPCTarget(params.Logger, livekit.SignalTarget_SUBSCRIBER),
})
if err != nil {
return nil, err
@@ -188,7 +188,7 @@ func NewParticipant(params ParticipantParams, perms *livekit.ParticipantPermissi
p.sendIceCandidate(c, livekit.SignalTarget_PUBLISHER)
})
p.subscriber.pc.OnICECandidate(func(c *webrtc.ICECandidate) {
if c == nil || p.State() == livekit.ParticipantInfo_DISCONNECTED {
if c == nil || p.State() == livekit.ParticipantInfo_DISCONNECTED || p.MigrateState() == types.MigrateStateInit {
return
}
p.sendIceCandidate(c, livekit.SignalTarget_SUBSCRIBER)
@@ -996,7 +996,7 @@ func (p *ParticipantImpl) sendIceCandidate(c *webrtc.ICECandidate, target liveki
// write candidate
p.params.Logger.Debugw("sending ice candidates",
"candidate", c.String())
"candidate", c.String(), "target", target)
trickle := ToProtoTrickle(ci)
trickle.Target = target
_ = p.writeMessage(&livekit.SignalResponse{
pkg/rtc/utils.go
+10
View File
@@ -157,3 +157,13 @@ func LoggerWithTrack(l logger.Logger, trackID livekit.TrackID) logger.Logger {
}
return logger.Logger(lr)
}
func LoggerWithPCTarget(l logger.Logger, target livekit.SignalTarget) logger.Logger {
lr := logr.Logger(l)
if lr.GetSink() == nil {
return l
}
lr = lr.WithValues("transport", target)
return logger.Logger(lr)
}