child_process: emit close in proper phase of eloop

1 files changed, 9 insertions, 18 deletions

diff --git a/lib/child_process.js b/lib/child_process.js
index bcbd08d6c..6c63d327b 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -355,6 +355,8 @@ function setupChannel(target, channel) {
       target.disconnect();
       channel.onread = nop;
       channel.close();
+      // TODO(trevnorris): Don't close this until after the close callback
+      // has fired.
       maybeClose(target);
     }
   };
@@ -853,26 +855,15 @@ function ChildProcess() {
       self.stdin.destroy();
     }
 
-    self._handle.close();
-    self._handle = null;
-
-    if (exitCode < 0) {
-      self.emit('error', err);
-    } else {
-      self.emit('exit', self.exitCode, self.signalCode);
-    }
-
-    // if any of the stdio streams have not been touched,
-    // then pull all the data through so that it can get the
-    // eof and emit a 'close' event.
-    // Do it on nextTick so that the user has one last chance
-    // to consume the output, if for example they only want to
-    // start reading the data once the process exits.
-    process.nextTick(function() {
+    self._handle.close(function() {
+      if (exitCode < 0)
+        self.emit('error', err);
+      else
+        self.emit('exit', self.exitCode, self.signalCode);
       flushStdio(self);
+      maybeClose(self);
     });
-
-    maybeClose(self);
+    self._handle = null;
   };
 }
 util.inherits(ChildProcess, EventEmitter);