Fix panic for concurrent streams map read and map write #1612

This commit is contained in:
Alex X
2025-02-24 21:02:33 +03:00
parent e55c2e9598
commit 90544ba713
5 changed files with 45 additions and 28 deletions
+3 -2
View File
@@ -47,11 +47,12 @@ func NewStream(source any) *Stream {
}
}
func (s *Stream) Sources() (sources []string) {
func (s *Stream) Sources() []string {
sources := make([]string, 0, len(s.producers))
for _, prod := range s.producers {
sources = append(sources, prod.url)
}
return
return sources
}
func (s *Stream) SetSource(source string) {
+34 -17
View File
@@ -42,10 +42,6 @@ func Init() {
})
}
func Get(name string) *Stream {
return streams[name]
}
var sanitize = regexp.MustCompile(`\s`)
// Validate - not allow creating dynamic streams with spaces in the source
@@ -68,6 +64,7 @@ func New(name string, sources ...string) *Stream {
streamsMu.Lock()
streams[name] = stream
streamsMu.Unlock()
return stream
}
@@ -124,7 +121,7 @@ func GetOrPatch(query url.Values) *Stream {
}
// check if src is stream name
if stream, ok := streams[source]; ok {
if stream := Get(source); stream != nil {
return stream
}
@@ -139,21 +136,41 @@ func GetOrPatch(query url.Values) *Stream {
return Patch(source, source)
}
func GetAll() (names []string) {
var log zerolog.Logger
// streams map
var streams = map[string]*Stream{}
var streamsMu sync.Mutex
func Get(name string) *Stream {
streamsMu.Lock()
defer streamsMu.Unlock()
return streams[name]
}
func Delete(name string) {
streamsMu.Lock()
defer streamsMu.Unlock()
delete(streams, name)
}
func GetAllNames() []string {
streamsMu.Lock()
names := make([]string, 0, len(streams))
for name := range streams {
names = append(names, name)
}
return
streamsMu.Unlock()
return names
}
func Streams() map[string]*Stream {
return streams
func GetAllSources() map[string][]string {
streamsMu.Lock()
sources := make(map[string][]string, len(streams))
for name, stream := range streams {
sources[name] = stream.Sources()
}
streamsMu.Unlock()
return sources
}
func Delete(id string) {
delete(streams, id)
}
var log zerolog.Logger
var streams = map[string]*Stream{}
var streamsMu sync.Mutex