RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2025-02-09 07:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

close custom commands with SIGINT again (#495)

Browse Source
This commit is contained in:
aler9 2021-10-03 16:09:40 +02:00
parent 131148ecb4
commit 0d15e2772a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/core/rtsp_server_test.go
View File

@ -719,7 +719,7 @@ func TestRTSPServerFallback(t *testing.T) {
func TestRTSPServerRunOnDemand(t *testing.T) {
doneFile := filepath.Join(os.TempDir(), "ondemand_done")
onDemandFile, err := writeTempFile([]byte(fmt.Sprintf(`#!/bin/sh
trap 'touch %s; [ -z "$(jobs -p)" ] || kill $(jobs -p)' QUIT
trap 'touch %s; [ -z "$(jobs -p)" ] || kill $(jobs -p)' INT
ffmpeg -hide_banner -loglevel error -re `+
`-i ../../testimages/ffmpeg/emptyvideo.mkv -c copy -f rtsp rtsp://localhost:$RTSP_PORT/$RTSP_PATH &
wait

2
internal/externalcmd/cmd_unix.go
View File

@ -32,7 +32,7 @@ func (e *Cmd) runInner() bool {
select {
case <-e.terminate:
syscall.Kill(cmd.Process.Pid, syscall.SIGQUIT)
syscall.Kill(cmd.Process.Pid, syscall.SIGINT)
<-cmdDone
return false