1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cluster: use process.disconnect method

Browse Source 
After adding a .disconect method and connected flag in child_process
we should no longer use the process._channel object.
This commit is contained in:
Andreas Madsen 2012-02-01 17:23:25 +01:00 committed by isaacs
parent a20872045a
commit 1595a6e885
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cluster.js
View File

@ -381,20 +381,18 @@ Worker.prototype.destroy = function() {
this.suicide = true; this.suicide = true;
if (cluster.isMaster) { if (cluster.isMaster) {
// Stop channel // Disconnect IPC channel
// this way the worker won't need to propagate suicide state to master // this way the worker won't need to propagate suicide state to master
closeWorkerChannel(this, function() { closeWorkerChannel(this, function() {
// Then kill worker
self.process.kill(); self.process.kill();
}); });
} else { } else {
// Channel is open // Channel is open
if (this.process._channel !== null) { if (this.process.connected) {
// Inform master that is is suicide and then kill // Inform master that is is suicide and then kill
sendInternalMessage(this, {cmd: 'suicide'}, function() { sendInternalMessage(this, {cmd: 'suicide'}, function() {
// Kill worker
process.exit(0); 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 // 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. // just kill, since we don't know if the quickDestroy function was called.
setInterval(function() { setInterval(function() {
if (self.process._channel === null) { if (!self.process.connected) {
process.exit(0); process.exit(0);
} }
}, 200); }, 200);
@ -430,6 +428,7 @@ cluster.fork = function(env) {
// However the workers may not die instantly // However the workers may not die instantly
function quickDestroyCluster() { function quickDestroyCluster() {
eachWorker(function(worker) { eachWorker(function(worker) {
worker.process.disconnect();
worker.process.kill(); worker.process.kill();
}); });
} }