child_process: reduce abort handler code duplication

Move duplicate abort handler logic into a separate function. PR-URL: #36644 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Daijiro Wachi <[email protected]>
nodejs · May 25, 2021 · ee7bc76 · ee7bc76
1 parent ecc600b
commit ee7bc76
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -354,6 +354,12 @@ function execFile(file /* , args, options, callback */) {
     }
   }
 
+  function abortHandler() {
+    if (!ex)
+      ex = new AbortError();
+    process.nextTick(() => kill());
+  }
+
   if (options.timeout > 0) {
     timeoutId = setTimeout(function delayedKill() {
       kill();
@@ -362,16 +368,11 @@ function execFile(file /* , args, options, callback */) {
   }
   if (options.signal) {
     if (options.signal.aborted) {
-      if (!ex)
-        ex = new AbortError();
-      process.nextTick(() => kill());
+      process.nextTick(abortHandler);
     } else {
       const childController = new AbortController();
-      options.signal.addEventListener('abort', () => {
-        if (!ex)
-          ex = new AbortError();
-        kill();
-      }, { signal: childController.signal });
+      options.signal.addEventListener('abort', abortHandler,
+                                      { signal: childController.signal });
       child.once('close', () => childController.abort());
     }
   }