restore RTSP_SERVER_PATH variable when using runOnDemand

This commit is contained in:
aler9 2020-09-19 17:15:33 +02:00
parent a0d076e8f0
commit 4750cc5a48
2 changed files with 2 additions and 2 deletions

View File

@ -481,7 +481,7 @@ func TestRunOnDemand(t *testing.T) {
stdin := []byte("\n" +
"paths:\n" +
" ondemand:\n" +
" runOnDemand: ffmpeg -hide_banner -loglevel error -re -i test-images/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/ondemand\n")
" runOnDemand: ffmpeg -hide_banner -loglevel error -re -i test-images/ffmpeg/emptyvideo.ts -c copy -f rtsp rtsp://localhost:8554/$RTSP_SERVER_PATH\n")
p1, err := newProgram([]string{"stdin"}, bytes.NewBuffer(stdin))
require.NoError(t, err)
defer p1.close()

View File

@ -229,7 +229,7 @@ func (pa *path) onDescribe(client *client) {
pa.lastDescribeActivation = time.Now()
var err error
pa.onDemandCmd, err = startExternalCommand(pa.confp.RunOnDemand, "")
pa.onDemandCmd, err = startExternalCommand(pa.confp.RunOnDemand, pa.name)
if err != nil {
pa.log("ERR: %s", err)
}