From 1078faef62aee5c77d3d7527dcda2c139a2bb9d3 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Thu, 4 Jan 2024 10:00:41 -0800 Subject: [PATCH] common: fix regression with not sending sigterm to ffmpeg --- server/package-lock.json | 4 ++-- server/src/media-helpers.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/package-lock.json b/server/package-lock.json index 3f429f88ef..f02438669c 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/server", - "version": "0.79.0", + "version": "0.80.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.79.0", + "version": "0.80.0", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.11", diff --git a/server/src/media-helpers.ts b/server/src/media-helpers.ts index 3147a19978..069543d4f8 100644 --- a/server/src/media-helpers.ts +++ b/server/src/media-helpers.ts @@ -31,6 +31,7 @@ export async function safeKillFFmpeg(cp: ChildProcess) { catch (e) { } } + cp.kill(); await sleep(2000); cp.kill('SIGKILL'); });