mirror of
https://github.com/bluenviron/mediamtx
synced 2024-12-15 03:04:45 +00:00
always use 'all_others' or 'all' after every other path configuration (#2798)
This commit is contained in:
parent
e06f4bc998
commit
15e6c199b4
@ -48,7 +48,17 @@ func getConfForPath(pathConfs map[string]*conf.Path, name string) (string, *conf
|
||||
|
||||
// regular expression-based path
|
||||
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)
|
||||
if m != nil {
|
||||
return pathConfName, pathConf, m, nil
|
||||
|
Loading…
Reference in New Issue
Block a user