Fixes #2306
This commit is contained in:
Andreas Madsen 2011-12-09 13:00:40 +01:00 committed by Ryan Dahl
parent b9049d2f90
commit a599aeb2a8
2 changed files with 21 additions and 23 deletions

View file

@ -81,11 +81,11 @@ function startMaster() {
// Quickly try to kill all the workers.
// TODO: be session leader - will cause auto SIGHUP to the children.
eachWorker(function(worker) {
debug("kill worker " + worker.pid);
debug('kill worker ' + worker.pid);
worker.kill();
})
});
console.error("Exception in cluster master process: " +
console.error('Exception in cluster master process: ' +
e.message + '\n' + e.stack);
process.exit(1);
});
@ -96,21 +96,21 @@ function handleWorkerMessage(worker, message) {
// This can only be called from the master.
assert(cluster.isMaster);
debug("recv " + JSON.stringify(message));
debug('recv ' + JSON.stringify(message));
switch (message.cmd) {
case 'online':
debug("Worker " + worker.pid + " online");
debug('Worker ' + worker.pid + ' online');
worker.online = true;
break;
case 'queryServer':
var key = message.address + ":" +
message.port + ":" +
var key = message.address + ':' +
message.port + ':' +
message.addressType;
var response = { _queryId: message._queryId };
if (key in servers == false) {
if (!(key in servers)) {
// Create a new server.
debug('create new server ' + key);
servers[key] = net._createServerHandle(message.address,
@ -136,7 +136,7 @@ function eachWorker(cb) {
cb(workers[id]);
}
}
};
}
cluster.fork = function() {
@ -176,19 +176,19 @@ cluster.fork = function() {
// Internal function. Called from src/node.js when worker process starts.
cluster._startWorker = function() {
assert(cluster.isWorker);
workerId = parseInt(process.env.NODE_WORKER_ID);
workerId = parseInt(process.env.NODE_WORKER_ID, 10);
queryMaster({ cmd: 'online' });
// Make callbacks from queryMaster()
process.on('message', function(msg, handle) {
debug("recv " + JSON.stringify(msg));
debug('recv ' + JSON.stringify(msg));
if (msg._queryId && msg._queryId in queryCallbacks) {
var cb = queryCallbacks[msg._queryId];
if (typeof cb == 'function') {
cb(msg, handle);
}
delete queryCallbacks[msg._queryId]
delete queryCallbacks[msg._queryId];
}
});
};
@ -219,7 +219,7 @@ cluster._getServer = function(address, port, addressType, cb) {
assert(cluster.isWorker);
queryMaster({
cmd: "queryServer",
cmd: 'queryServer',
address: address,
port: port,
addressType: addressType