cluster: use process.disconnect method

After adding a .disconect method and connected flag in child_process
we should no longer use the process._channel object.

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/cluster.js b/lib/cluster.js
index f08b15d0bb..205df81466 100644
--- a/lib/cluster.js
+++ b/lib/cluster.js
@@ -381,20 +381,18 @@ Worker.prototype.destroy = function() {
   this.suicide = true;
 
   if (cluster.isMaster) {
-    // Stop channel
+    // Disconnect IPC channel
     // this way the worker won't need to propagate suicide state to master
     closeWorkerChannel(this, function() {
-      // Then kill worker
       self.process.kill();
     });
 
   } else {
     // Channel is open
-    if (this.process._channel !== null) {
+    if (this.process.connected) {
 
       // Inform master that is is suicide and then kill
       sendInternalMessage(this, {cmd: 'suicide'}, function() {
-        // Kill worker
         process.exit(0);
       });
 
@@ -404,7 +402,7 @@ Worker.prototype.destroy = function() {
       // from the master is resicved. Also we can't do a timeout and then
       // just kill, since we don't know if the quickDestroy function was called.
       setInterval(function() {
-        if (self.process._channel === null) {
+        if (!self.process.connected) {
           process.exit(0);
         }
       }, 200);
@@ -430,6 +428,7 @@ cluster.fork = function(env) {
 // However the workers may not die instantly
 function quickDestroyCluster() {
   eachWorker(function(worker) {
+    worker.process.disconnect();
     worker.process.kill();
   });
 }