Browse Source

restore RTSP_SERVER_PATH variable when using runOnDemand

pull/97/head
aler9 5 years ago
parent
commit
4750cc5a48
  1. 2
      main_test.go
  2. 2
      path.go

2
main_test.go

@ -481,7 +481,7 @@ func TestRunOnDemand(t *testing.T) {
stdin := []byte("\n" + stdin := []byte("\n" +
"paths:\n" + "paths:\n" +
" ondemand:\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)) p1, err := newProgram([]string{"stdin"}, bytes.NewBuffer(stdin))
require.NoError(t, err) require.NoError(t, err)
defer p1.close() defer p1.close()

2
path.go

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

Loading…
Cancel
Save