Fix #2507 Raise errors less agressively when destroying stdio streams

Also, if an error is already provided, then raise the provided
error, rather than throwing it with a less helpful 'stdout cannot
be closed' message.

This is important for properly handling EPIPEs.

diff --git a/src/node.js b/src/node.js
index 15cccb6..80f30a0 100644 (file)
--- a/src/node.js
+++ b/src/node.js
@@ -280,8 +280,9 @@
     process.__defineGetter__('stdout', function() {
       if (stdout) return stdout;
       stdout = createWritableStdioStream(1);
-      stdout.end = stdout.destroy = stdout.destroySoon = function() {
-        throw new Error('process.stdout cannot be closed');
+      stdout.destroy = stdout.destroySoon = function(er) {
+        er = er || new Error('process.stdout cannot be closed.');
+        stdout.emit('error', er);
       };
       return stdout;
     });
@@ -289,8 +290,9 @@
     process.__defineGetter__('stderr', function() {
       if (stderr) return stderr;
       stderr = createWritableStdioStream(2);
-      stderr.end = stderr.destroy = stderr.destroySoon = function() {
-        throw new Error('process.stderr cannot be closed');
+      stderr.destroy = stderr.destroySoon = function(er) {
+        er = er || new Error('process.stderr cannot be closed.');
+        stderr.emit('error', er);
       };
       return stderr;
     });

diff --git a/test/fixtures/catch-stdout-error.js b/test/fixtures/catch-stdout-error.js
new file mode 100644 (file)
index 0000000..6f96ae9
--- /dev/null
+++ b/test/fixtures/catch-stdout-error.js
@@ -0,0 +1,38 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+function write() {
+  try {
+    process.stdout.write('Hello, world\n');
+  } catch (ex) {
+    throw new Error('this should never happen');
+  }
+  process.nextTick(function () {
+    write();
+  });
+}
+
+process.stdout.on('error', function (er) {
+  console.error(JSON.stringify(er));
+  process.exit(42);
+});
+
+write();

diff --git a/test/simple/test-stdout-close-catch.js b/test/simple/test-stdout-close-catch.js
new file mode 100644 (file)
index 0000000..a8373c4
--- /dev/null
+++ b/test/simple/test-stdout-close-catch.js
@@ -0,0 +1,56 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+var common = require('../common');
+var assert = require('assert');
+var path = require('path');
+var child_process = require('child_process');
+var fs = require('fs');
+
+var testScript = path.join(common.fixturesDir, 'catch-stdout-error.js');
+
+var cmd = JSON.stringify(process.execPath) + ' ' +
+          JSON.stringify(testScript) + ' | ' +
+          JSON.stringify(process.execPath) + ' ' +
+          '-pe "process.exit(1);"';
+
+var child = child_process.exec(cmd);
+var output = '';
+var outputExpect = { 'code': 'EPIPE',
+                     'errno': 'EPIPE',
+                     'syscall': 'write' };
+
+child.stderr.on('data', function (c) {
+  output += c;
+});
+
+child.on('exit', function(code) {
+  try {
+    output = JSON.parse(output);
+  } catch (er) {
+    console.error(output);
+    process.exit(1);
+  }
+
+  assert.deepEqual(output, outputExpect);
+  console.log('ok');
+});