From 8d169fe558946512d1d235604a5336e8d4d57464 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Wed, 18 Dec 2019 17:21:57 +0800 Subject: [PATCH 1/3] Update kill.js --- lib/kill.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/kill.js b/lib/kill.js index dc1c77c38..ef9de72d4 100644 --- a/lib/kill.js +++ b/lib/kill.js @@ -18,9 +18,10 @@ const setKillTimeout = (kill, signal, options, killResult) => { } const timeout = getForceKillAfterTimeout(options); - setTimeout(() => { + const t = setTimeout(() => { kill('SIGKILL'); - }, timeout).unref(); + }, timeout); + if (t.unref) t.unref(); }; const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => { From 6ddf0157a6da98153dc519e956b55a2fa37246b2 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Wed, 18 Dec 2019 17:46:13 +0800 Subject: [PATCH 2/3] Update kill.js --- lib/kill.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/kill.js b/lib/kill.js index ef9de72d4..63bc0143b 100644 --- a/lib/kill.js +++ b/lib/kill.js @@ -21,7 +21,10 @@ const setKillTimeout = (kill, signal, options, killResult) => { const t = setTimeout(() => { kill('SIGKILL'); }, timeout); - if (t.unref) t.unref(); + + if (t.unref) { + t.unref(); + } }; const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => { From dfaba8e4548d253cb8d9b5acb7e3cec466819dcd Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Wed, 18 Dec 2019 17:31:24 +0700 Subject: [PATCH 3/3] Update lib/kill.js Co-Authored-By: ehmicky --- lib/kill.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/kill.js b/lib/kill.js index 63bc0143b..813cf2e08 100644 --- a/lib/kill.js +++ b/lib/kill.js @@ -22,6 +22,7 @@ const setKillTimeout = (kill, signal, options, killResult) => { kill('SIGKILL'); }, timeout); + // istanbul ignore else if (t.unref) { t.unref(); }