This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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.
  • Loading branch information...
1 parent a208720 commit 1595a6e885eebd5a9d854bd462ab1b80521ff754 @AndreasMadsen AndreasMadsen committed with isaacs Feb 1, 2012
Showing with 4 additions and 5 deletions.
  1. +4 −5 lib/cluster.js
View
@@ -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();
});
}

0 comments on commit 1595a6e

Please sign in to comment.