Revert "cluster: wait on servers closing before disconnect"

This reverts commit 9c0a1b8. CI is timing out, work is continuing in #1934
nodejs · Jun 11, 2015 · e194480 · e194480
1 parent 0f68377
commit e194480
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 58 deletions.
diff --git a/lib/cluster.js b/lib/cluster.js
@@ -627,26 +627,12 @@ function workerInit() {
 
   Worker.prototype.disconnect = function() {
     this.suicide = true;
-    var waitingHandles = 0;
-
-    function checkRemainingHandles() {
-      waitingHandles--;
-      if (waitingHandles === 0) {
-        process.disconnect();
-      }
-    }
-
     for (var key in handles) {
       var handle = handles[key];
       delete handles[key];
-      waitingHandles++;
-      handle.owner.close(checkRemainingHandles);
-    }
-
-    if (waitingHandles === 0) {
-      process.disconnect();
+      handle.close();
     }
-
+    process.disconnect();
   };
 
   Worker.prototype.destroy = function() {

diff --git a/test/parallel/test-cluster-worker-wait-server-close.js b/test/parallel/test-cluster-worker-wait-server-close.js