add option to buffer stdout

This commit is contained in:
Girish Ramakrishnan
2016-04-18 15:02:31 -07:00
parent 8dcde84c3c
commit 6b1e14b464
2 changed files with 12 additions and 16 deletions

View File

@@ -397,14 +397,8 @@ function getContainerIdByIp(ip, callback) {
function execContainer(containerId, cmd, options, callback) {
assert.strictEqual(typeof containerId, 'string');
assert(util.isArray(cmd));
if (typeof options === 'function') {
callback = options;
options = { };
} else {
assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof callback, 'function');
}
assert.strictEqual(typeof options, 'object');
assert.strictEqual(typeof callback, 'function');
callback = once(callback); // ChildProcess exit may or may not be called after error
@@ -414,8 +408,10 @@ function execContainer(containerId, cmd, options, callback) {
if (options.stdout) {
cp.stdout.pipe(options.stdout);
} else {
} else if (options.bufferStdout) {
cp.stdout.on('data', function (chunk) { chunks.push(chunk); });
} else {
cp.stdout.pipe(process.stdout);
}
cp.on('error', callback);