diff --git a/internal/conf/path.go b/internal/conf/path.go index 967083e2..b53510c9 100644 --- a/internal/conf/path.go +++ b/internal/conf/path.go @@ -767,7 +767,7 @@ func (pconf *Path) validate( } } else { if pconf.Source != "publisher" && pconf.Source != "redirect" && pconf.Regexp != nil { - return fmt.Errorf("a path with a regular expression (or path 'all') and a static source" + + return fmt.Errorf("a path with a regular expression (or path 'all_others') and a static source" + " must have 'sourceOnDemand' set to true") } } @@ -791,7 +791,7 @@ func (pconf *Path) validate( if pconf.AlwaysAvailable { if pconf.Regexp != nil { - return fmt.Errorf("'alwaysAvailable' cannot be used in a path with a regular expression (or path 'all')") + return fmt.Errorf("'alwaysAvailable' cannot be used in a path with a regular expression (or path 'all_others')") } if pconf.SourceOnDemand { @@ -923,7 +923,7 @@ func (pconf *Path) validate( // Hooks if pconf.RunOnInit != "" && pconf.Regexp != nil { - return fmt.Errorf("a path with a regular expression (or path 'all')" + + return fmt.Errorf("a path with a regular expression (or path 'all_others')" + " does not support option 'runOnInit'; use another path") } diff --git a/internal/core/path_test.go b/internal/core/path_test.go index c34db1b7..5b83c2c4 100644 --- a/internal/core/path_test.go +++ b/internal/core/path_test.go @@ -908,7 +908,7 @@ func TestPathResolveSource(t *testing.T) { " '~^test_(.+)$':\n"+ " source: rtsp://127.0.0.1:8555/$G1?$MTX_QUERY\n"+ " sourceOnDemand: yes\n"+ - " 'all':\n") + " 'all_others':\n") require.Equal(t, true, ok) defer p.Close()