zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-11-01 19:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

close custom commands with SIGQUIT instead of SIGINT (#495)

Browse Source
This commit is contained in:
aler9
2021-08-12 15:16:39 +02:00
parent ceed37838e
commit d7f1c04711
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/core/rtsp_server_test.go
View File

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

3
internal/externalcmd/cmd_unix.go
View File

@@ -5,6 +5,7 @@ package externalcmd
import ( import (
"os" "os"
"os/exec" "os/exec"
"syscall"
) )
func (e *Cmd) runInner() bool { func (e *Cmd) runInner() bool {
@@ -31,7 +32,7 @@ func (e *Cmd) runInner() bool {
select { select {
case <-e.terminate: case <-e.terminate:
cmd.Process.Signal(os.Interrupt) syscall.Kill(cmd.Process.Pid, syscall.SIGQUIT)
<-cmdDone <-cmdDone
return false return false