Merge pull request #6527 from murgatroid99/node_tools_plugin_encoding_fix

Fix encoding and piping problems with Node plugin wrapper
pull/6536/head
Nicolas Noble 9 years ago
commit 1a56147dd8
  1. 7
      src/node/tools/bin/protoc.js
  2. 8
      src/node/tools/bin/protoc_plugin.js

@ -47,10 +47,11 @@ var exe_ext = process.platform === 'win32' ? '.exe' : '';
var protoc = path.resolve(__dirname, 'protoc' + exe_ext); var protoc = path.resolve(__dirname, 'protoc' + exe_ext);
execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) { var child_process = execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) {
if (error) { if (error) {
throw error; throw error;
} }
console.log(stdout);
console.log(stderr);
}); });
child_process.stdout.pipe(process.stdout);
child_process.stderr.pipe(process.stderr);

@ -47,10 +47,12 @@ var exe_ext = process.platform === 'win32' ? '.exe' : '';
var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext); var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext);
execFile(plugin, process.argv.slice(2), function(error, stdout, stderr) { var child_process = execFile(plugin, process.argv.slice(2), {encoding: 'buffer'}, function(error, stdout, stderr) {
if (error) { if (error) {
throw error; throw error;
} }
console.log(stdout);
console.log(stderr);
}); });
process.stdin.pipe(child_process.stdin);
child_process.stdout.pipe(process.stdout);
child_process.stderr.pipe(process.stderr);

Loading…
Cancel
Save