1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

child_process: align fork/spawn stdio error msg

Browse Source 
fork()'s support for .stdio strings in 3268863eb used a different
TypeError string from spawn, unnecessarily.

PR-URL: https://github.com/nodejs/node/pull/11044
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>
This commit is contained in:
Sam Roberts 2017-01-30 13:52:09 -08:00 committed by James M Snell
parent 78182458e6
commit 4cafa60c99
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/child_process.js
View File

@ -18,7 +18,14 @@ const setupChannel = child_process.setupChannel;
const ChildProcess = exports.ChildProcess = child_process.ChildProcess; const ChildProcess = exports.ChildProcess = child_process.ChildProcess;
function stdioStringToArray(option) { function stdioStringToArray(option) {
return [option, option, option, 'ipc']; switch (option) {
case 'ignore':
case 'pipe':
case 'inherit':
return [option, option, option, 'ipc'];
default:
throw new TypeError('Incorrect value of stdio option: ' + option);
}
} }
exports.fork = function(modulePath /*, args, options*/) { exports.fork = function(modulePath /*, args, options*/) {
@ -55,15 +62,7 @@ exports.fork = function(modulePath /*, args, options*/) {
args = execArgv.concat([modulePath], args); args = execArgv.concat([modulePath], args);
if (typeof options.stdio === 'string') { if (typeof options.stdio === 'string') {
switch (options.stdio) { options.stdio = stdioStringToArray(options.stdio);
case 'ignore':
case 'pipe':
case 'inherit':
options.stdio = stdioStringToArray(options.stdio);
break;
default:
throw new TypeError('Unknown stdio option');
}
} else if (!Array.isArray(options.stdio)) { } else if (!Array.isArray(options.stdio)) {
// Use a separate fd=3 for the IPC channel. Inherit stdin, stdout, // Use a separate fd=3 for the IPC channel. Inherit stdin, stdout,
// and stderr from the parent if silent isn't set. // and stderr from the parent if silent isn't set.

2
test/parallel/test-child-process-fork-stdio-string-variant.js
View File

@ -9,7 +9,7 @@ const assert = require('assert');
const fork = require('child_process').fork; const fork = require('child_process').fork;
const childScript = `${common.fixturesDir}/child-process-spawn-node`; const childScript = `${common.fixturesDir}/child-process-spawn-node`;
const errorRegexp = /^TypeError: Unknown stdio option$/; const errorRegexp = /^TypeError: Incorrect value of stdio option:/;
const malFormedOpts = {stdio: '33'}; const malFormedOpts = {stdio: '33'};
const payload = {hello: 'world'}; const payload = {hello: 'world'};
const stringOpts = {stdio: 'pipe'}; const stringOpts = {stdio: 'pipe'};