Code refactoring for stream MarshalJSON
This commit is contained in:
@@ -132,11 +132,10 @@ func (p *Producer) AddTrack(media *core.Media, codec *core.Codec, track *core.Re
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Producer) MarshalJSON() ([]byte, error) {
|
func (p *Producer) MarshalJSON() ([]byte, error) {
|
||||||
if p.conn != nil {
|
if conn := p.conn; conn != nil {
|
||||||
return json.Marshal(p.conn)
|
return json.Marshal(conn)
|
||||||
}
|
}
|
||||||
|
info := map[string]string{"url": p.url}
|
||||||
info := core.Info{URL: p.url}
|
|
||||||
return json.Marshal(info)
|
return json.Marshal(info)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -112,19 +112,12 @@ producers:
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *Stream) MarshalJSON() ([]byte, error) {
|
func (s *Stream) MarshalJSON() ([]byte, error) {
|
||||||
if !s.mu.TryLock() {
|
var info = struct {
|
||||||
log.Warn().Msgf("[streams] json locked")
|
|
||||||
return json.Marshal(nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
var info struct {
|
|
||||||
Producers []*Producer `json:"producers"`
|
Producers []*Producer `json:"producers"`
|
||||||
Consumers []core.Consumer `json:"consumers"`
|
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)
|
return json.Marshal(info)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user