child_process: reduce abort handler code duplication

Trott · danielleadams · commit b98cc51be20f · 2021-01-12T07:10:24.000-05:00
Move duplicate abort handler logic into a separate function. PR-URL: #36644 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -368,6 +368,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();
@@ -376,16 +382,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());
 }
 }

-Original file line number
+Diff line change
+}
+}
 +functionabortHandler(){
 +if(!ex)
 +ex=newAbortError();
 +process.nextTick(()=>kill());
 +}
++
 if(options.timeout>0){
 timeoutId=setTimeout(functiondelayedKill(){
 kill();
+}
 if(options.signal){
 if(options.signal.aborted){
 -if(!ex)
 -ex=newAbortError();
 -process.nextTick(()=>kill());
 +process.nextTick(abortHandler);
 }else{
 constchildController=newAbortController();
 -options.signal.addEventListener('abort',()=>{
 -if(!ex)
 -ex=newAbortError();
 -kill();
 -},{signal: childController.signal});
 +options.signal.addEventListener('abort',abortHandler,
 +{signal: childController.signal});
 child.once('close',()=>childController.abort());
+}
+}