added startTimer so that repeated errors on startup don't cause the loader to go into an infinite loop

v1.18.x
Julian Lam 11 years ago
parent b28b837d72
commit 74ff579412

@ -6,6 +6,18 @@ var nconf = require('nconf'),
start = function() { start = function() {
var fork = require('child_process').fork, var fork = require('child_process').fork,
nbb_start = function() { nbb_start = function() {
if (timesStarted > 3) {
console.log('\n[loader] Experienced three start attempts in 10 seconds, most likely am error on startup. Halting.');
process.exit();
return;
}
timesStarted++;
if (startTimer) {
clearTimeout(startTimer);
}
startTimer = setTimeout(resetTimer, 1000*10);
nbb = fork('./app', process.argv.slice(2), { nbb = fork('./app', process.argv.slice(2), {
env: { env: {
'NODE_ENV': process.env.NODE_ENV 'NODE_ENV': process.env.NODE_ENV
@ -29,6 +41,10 @@ var nconf = require('nconf'),
}); });
}, },
nbb_stop = function() { nbb_stop = function() {
if (startTimer) {
clearTimeout(startTimer);
}
nbb.kill(); nbb.kill();
if (fs.existsSync(pidFilePath)) { if (fs.existsSync(pidFilePath)) {
var pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10); var pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
@ -42,7 +58,13 @@ var nconf = require('nconf'),
nbb_start(); nbb_start();
}); });
nbb.kill(); nbb.kill();
}; },
resetTimer = function() {
clearTimeout(startTimer);
timesStarted = 0;
},
timesStarted = 0,
startTimer;
process.on('SIGINT', nbb_stop); process.on('SIGINT', nbb_stop);
process.on('SIGTERM', nbb_stop); process.on('SIGTERM', nbb_stop);

Loading…
Cancel
Save