From a25ab53026cc85f04b3e8cfcc957e29cf846f9a8 Mon Sep 17 00:00:00 2001 From: ehmicky Date: Mon, 3 Jun 2019 10:00:00 +0200 Subject: [PATCH] Rename variable --- index.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/index.js b/index.js index 5d3d20d9dd..f27971772d 100644 --- a/index.js +++ b/index.js @@ -213,13 +213,13 @@ function joinCommand(file, args = []) { return [file, ...args].join(' '); } -function kill(originalKill, signal = 'SIGTERM', options = {}) { - const killResult = originalKill(signal); - setKillTimeout(originalKill, signal, options, killResult); +function spawnedKill(kill, signal = 'SIGTERM', options = {}) { + const killResult = kill(signal); + setKillTimeout(kill, signal, options, killResult); return killResult; } -function setKillTimeout(originalKill, signal, options, killResult) { +function setKillTimeout(kill, signal, options, killResult) { if (!shouldForceKill(signal, options, killResult)) { return; } @@ -227,7 +227,7 @@ function setKillTimeout(originalKill, signal, options, killResult) { const forceKillAfter = Number.isInteger(options.forceKillAfter) ? options.forceKillAfter : 5000; - setTimeout(() => forceKill(originalKill), forceKillAfter).unref(); + setTimeout(() => forceKill(kill), forceKillAfter).unref(); } function shouldForceKill(signal, options, killResult) { @@ -238,9 +238,9 @@ function shouldForceKill(signal, options, killResult) { killResult; } -function forceKill(originalKill) { +function forceKill(kill) { try { - originalKill('SIGKILL'); + kill('SIGKILL'); } catch (_) {} } @@ -262,8 +262,8 @@ const execa = (file, args, options) => { })); } - const originalKill = spawned.kill.bind(spawned); - spawned.kill = kill.bind(null, originalKill); + const kill = spawned.kill.bind(spawned); + spawned.kill = spawnedKill.bind(null, kill); // #115 let removeExitHandler;