CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

always use 'all_others' or 'all' after every other path configuration (#2798)

Browse source
This commit is contained in:
Alessandro Ros 2023-12-10 19:28:02 +01:00 • committed by GitHub
parent e06f4bc998
commit 15e6c199b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
internal/core/path_manager.go
View file

@ -48,7 +48,17 @@ func getConfForPath(pathConfs map[string]*conf.Path, name string) (string, *conf
// regular expression-based path // regular expression-based path
for pathConfName, pathConf := range pathConfs { for pathConfName, pathConf := range pathConfs {
if pathConf.Regexp != nil { if pathConf.Regexp != nil && pathConfName != "all" && pathConfName != "all_others" {
m := pathConf.Regexp.FindStringSubmatch(name)
if m != nil {
return pathConfName, pathConf, m, nil
}
}
}
// process path configuration "all_others" after everything else
for pathConfName, pathConf := range pathConfs {
if pathConfName == "all" || pathConfName == "all_others" {
m := pathConf.Regexp.FindStringSubmatch(name) m := pathConf.Regexp.FindStringSubmatch(name)
if m != nil { if m != nil {
return pathConfName, pathConf, m, nil return pathConfName, pathConf, m, nil