Fix ghost exec/ffmpeg process

2024-06-05 19:59:22 +03:00
parent 756be9801e
commit 9bb36ebb6c
4 changed files with 15 additions and 3 deletions
@@ -113,7 +113,7 @@ func handleRTSP(url string, cmd *exec.Cmd, path string) (core.Producer, error) {
 		cmd.Stdout = os.Stdout
 	}

-	waiter := make(chan core.Producer)
+	waiter := make(chan *pkg.Conn, 1)

 	waitersMu.Lock()
 	waiters[path] = waiter
@@ -149,6 +149,10 @@ func handleRTSP(url string, cmd *exec.Cmd, path string) (core.Producer, error) {
 		return nil, fmt.Errorf("exec/rtsp\n%s", cmd.Stderr)
 	case prod := <-waiter:
 		log.Debug().Stringer("launch", time.Since(ts)).Msg("[exec] run rtsp")
+		prod.OnClose = func() error {
+			log.Debug().Msgf("[exec] kill rtsp")
+			return errors.Join(cmd.Process.Kill(), cmd.Wait())
+		}
 		return prod, nil
 	}
 }
@@ -157,7 +161,7 @@ func handleRTSP(url string, cmd *exec.Cmd, path string) (core.Producer, error) {

 var (
 	log       zerolog.Logger
-	waiters   = map[string]chan core.Producer{}
+	waiters   = make(map[string]chan *pkg.Conn)
 	waitersMu sync.Mutex
 )