From f21bc849672979aef2d5b044144f58bb898b7353 Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Wed, 18 Sep 2024 12:39:53 +0530 Subject: [PATCH] Log only when not nil. (#3015) * Log only when not nil. Default logging confuses debugging as we call using nil as well to make the call site simpler. And logging a nil makes it look like it is incorrect seeding. `nil` fields do not seed. So, don't log when `nil`. * log SDP --- pkg/rtc/participant.go | 8 ++++---- pkg/sfu/downtrack.go | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index a22f0b17f..acd59cb45 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -774,7 +774,7 @@ func (p *ParticipantImpl) HandleSignalSourceClose() { // HandleOffer an offer from remote participant, used when clients make the initial connection func (p *ParticipantImpl) HandleOffer(offer webrtc.SessionDescription) { - p.pubLogger.Debugw("received offer", "transport", livekit.SignalTarget_PUBLISHER) + p.pubLogger.Debugw("received offer", "transport", livekit.SignalTarget_PUBLISHER, "offer", offer) shouldPend := false if p.MigrateState() == types.MigrateStateInit { shouldPend = true @@ -788,7 +788,7 @@ func (p *ParticipantImpl) HandleOffer(offer webrtc.SessionDescription) { // HandleAnswer handles a client answer response, with subscriber PC, server initiates the // offer and client answers func (p *ParticipantImpl) HandleAnswer(answer webrtc.SessionDescription) { - p.subLogger.Debugw("received answer", "transport", livekit.SignalTarget_SUBSCRIBER) + p.subLogger.Debugw("received answer", "transport", livekit.SignalTarget_SUBSCRIBER, "answer", answer) /* from server received join request to client answer * 1. server send join response & offer @@ -806,8 +806,8 @@ func (p *ParticipantImpl) onPublisherAnswer(answer webrtc.SessionDescription) er return nil } - p.pubLogger.Debugw("sending answer", "transport", livekit.SignalTarget_PUBLISHER) answer = p.configurePublisherAnswer(answer) + p.pubLogger.Debugw("sending answer", "transport", livekit.SignalTarget_PUBLISHER, "answer", answer) return p.writeMessage(&livekit.SignalResponse{ Message: &livekit.SignalResponse_Answer{ Answer: ToProtoSessionDescription(answer), @@ -1505,7 +1505,7 @@ func (p *ParticipantImpl) setIsPublisher(isPublisher bool) { // when the server has an offer for participant func (p *ParticipantImpl) onSubscriberOffer(offer webrtc.SessionDescription) error { - p.subLogger.Debugw("sending offer", "transport", livekit.SignalTarget_SUBSCRIBER) + p.subLogger.Debugw("sending offer", "transport", livekit.SignalTarget_SUBSCRIBER, "offer", offer) return p.writeMessage(&livekit.SignalResponse{ Message: &livekit.SignalResponse_Offer{ Offer: ToProtoSessionDescription(offer), diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index 87eb6f81c..c49f02e35 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -1253,7 +1253,9 @@ func (d *DownTrack) GetState() DownTrackState { } func (d *DownTrack) SeedState(state DownTrackState) { - d.params.Logger.Debugw("seeding down track state", "state", state) + if state.RTPStats != nil || state.ForwarderState != nil { + d.params.Logger.Debugw("seeding down track state", "state", state) + } if state.RTPStats != nil { d.rtpStats.Seed(state.RTPStats) d.deltaStatsSenderSnapshotId = state.DeltaStatsSenderSnapshotId