From 1ac9d54dab4911776d22ecadb281f52ca193dcef Mon Sep 17 00:00:00 2001 From: Alex X Date: Mon, 10 Jun 2024 16:42:34 +0300 Subject: [PATCH] Code refactoring for stream MarshalJSON --- internal/streams/producer.go | 7 +++---- internal/streams/stream.go | 15 ++++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/internal/streams/producer.go b/internal/streams/producer.go index daca7edf..09e2dcc5 100644 --- a/internal/streams/producer.go +++ b/internal/streams/producer.go @@ -132,11 +132,10 @@ func (p *Producer) AddTrack(media *core.Media, codec *core.Codec, track *core.Re } func (p *Producer) MarshalJSON() ([]byte, error) { - if p.conn != nil { - return json.Marshal(p.conn) + if conn := p.conn; conn != nil { + return json.Marshal(conn) } - - info := core.Info{URL: p.url} + info := map[string]string{"url": p.url} return json.Marshal(info) } diff --git a/internal/streams/stream.go b/internal/streams/stream.go index 5dacf991..bb832694 100644 --- a/internal/streams/stream.go +++ b/internal/streams/stream.go @@ -112,19 +112,12 @@ producers: } func (s *Stream) MarshalJSON() ([]byte, error) { - if !s.mu.TryLock() { - log.Warn().Msgf("[streams] json locked") - return json.Marshal(nil) - } - - var info struct { + var info = struct { Producers []*Producer `json:"producers"` Consumers []core.Consumer `json:"consumers"` + }{ + Producers: s.producers, + Consumers: s.consumers, } - info.Producers = s.producers - info.Consumers = s.consumers - - s.mu.Unlock() - return json.Marshal(info) }