diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go index 79e9dafb5..e9bf6bbc8 100644 --- a/pkg/rtc/participant.go +++ b/pkg/rtc/participant.go @@ -2,7 +2,6 @@ package rtc import ( "context" - "io" "os" "strconv" "strings" @@ -1390,7 +1389,7 @@ func (p *ParticipantImpl) subscriberRTCPWorker() { pkts = append(pkts, &rtcp.SourceDescription{Chunks: sd}) } if err := p.TransportManager.WriteSubscriberRTCP(pkts); err != nil { - if err == io.EOF || err == io.ErrClosedPipe { + if IsEOF(err) { return } p.params.Logger.Errorw("could not send down track reports", err) @@ -1407,7 +1406,7 @@ func (p *ParticipantImpl) subscriberRTCPWorker() { pkts = append(pkts, &rtcp.SourceDescription{Chunks: sd}) } if err := p.TransportManager.WriteSubscriberRTCP(pkts); err != nil { - if err == io.EOF || err == io.ErrClosedPipe { + if IsEOF(err) { return } p.params.Logger.Errorw("could not send down track reports", err) @@ -1980,7 +1979,9 @@ func (p *ParticipantImpl) publisherRTCPWorker() { } if err := p.TransportManager.WritePublisherRTCP(pkts); err != nil { - p.params.Logger.Errorw("could not write RTCP to participant", err) + if !IsEOF(err) { + p.params.Logger.Errorw("could not write RTCP to participant", err) + } } } } diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go index 5af97a78c..653ff80b8 100644 --- a/pkg/service/rtcservice.go +++ b/pkg/service/rtcservice.go @@ -347,7 +347,7 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) { websocket.IsCloseError(err, websocket.CloseAbnormalClosure, websocket.CloseGoingAway, websocket.CloseNormalClosure, websocket.CloseNoStatusReceived) { pLogger.Infow("exit ws read loop for closed connection", "connID", cr.ConnectionID, "wsError", err) } else { - pLogger.Errorw("error reading from websocket", err) + pLogger.Errorw("error reading from websocket", err, "connID", cr.ConnectionID) } return } diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index 03eaa1a24..848595ae4 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -221,9 +221,6 @@ type DownTrack struct { deltaStatsSnapshotId uint32 deltaStatsOverriddenSnapshotId uint32 - // for throttling error logs - writeIOErrors atomic.Uint32 - isNACKThrottled atomic.Bool activePaddingOnMuteUpTrack atomic.Bool @@ -610,12 +607,7 @@ func (d *DownTrack) WriteRTP(extPkt *buffer.ExtPacket, layer int32) error { _, err = d.writeStream.WriteRTP(hdr, payload) if err != nil { - if errors.Is(err, io.ErrClosedPipe) { - writeIOErrors := d.writeIOErrors.Inc() - if (writeIOErrors % 100) == 1 { - d.logger.Errorw("write rtp packet failed", err, "count", writeIOErrors) - } - } else { + if !errors.Is(err, io.ErrClosedPipe) { d.logger.Errorw("write rtp packet failed", err) } return err