child process: fix processes with IPC channel don't emit 'close'

With this patch the stdio channel is no longer available in the ChildProcess.stdio array.
nodejs · Aug 30, 2012 · 191b4d4 · 191b4d4
1 parent 355c148
commit 191b4d4
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -303,6 +303,10 @@ function setupChannel(target, channel) {
     }
   };
 
+  channel.onclose = function() {
+    maybeClose(target);
+  };
+
   // object where socket lists will live
   channel.sockets = { got: {}, send: {} };
 
@@ -745,7 +749,7 @@ ChildProcess.prototype.spawn = function(options) {
       ipc = createPipe(true);
       ipcFd = i;
 
-      acc.push({ type: 'pipe', handle: ipc });
+      acc.push({ type: 'pipe', handle: ipc, ipc: true });
     } else if (typeof stdio === 'number' || typeof stdio.fd === 'number') {
       acc.push({ type: 'fd', fd: stdio.fd || stdio });
     } else if (getHandleWrapType(stdio) || getHandleWrapType(stdio.handle) ||
@@ -796,6 +800,11 @@ ChildProcess.prototype.spawn = function(options) {
   stdio.forEach(function(stdio, i) {
     if (stdio.type === 'ignore') return;
 
+    if (stdio.ipc) {
+      self._closesNeeded++;
+      return;
+    }
+
     if (stdio.handle) {
       // when i === 0 - we're dealing with stdin
       // (which is the only one writable pipe)