diff --git a/lib/shutdown.js b/lib/shutdown.js index 24a18711e7eb353f3aa1aaf614f733f1290528e3..150ed351f73ed4a22ad3acb5b638898844c56ae4 100644 --- a/lib/shutdown.js +++ b/lib/shutdown.js @@ -75,7 +75,7 @@ exports.handleTerminationSignals = function(app, callback) { }; } - if (!process.env.NO_SIGNALS) { + if (process.env.SUPPORTS_SIGNALS) { process.on('SIGINT', endIt('INT')).on('SIGTERM', endIt('TERM')).on('SIGQUIT', endIt('QUIT')); } }; diff --git a/scripts/run_locally.js b/scripts/run_locally.js index d602f22fda1882c92959940a743a437edb9b2f76..7aad2a27fb5cc16a3425785b2bc77d2a5fc83ab4 100755 --- a/scripts/run_locally.js +++ b/scripts/run_locally.js @@ -79,17 +79,17 @@ if (config.get('env').substr(0,5) === 'test_') { } // Windows can't use signals, so lets figure out if we should use them -// To force signals, NO_SIGNALS=true. +// To force signals, set the environment variable SUPPORTS_SIGNALS=true. // Otherwise, they will be feature-detected. -var SIGNALS_PROP = 'NO_SIGNALS'; -if (!(SINGALS_PROP in process.env)) { +var SIGNALS_PROP = 'SUPPORTS_SIGNALS'; +if (!(SIGNALS_PROP in process.env)) { try { function signals_test() {} process.on('SIGINT', signals_test); process.removeListener('SIGINT', signals_test); - process.env[SIGNALS_PROP] = false; - } catch (noSignals) { process.env[SIGNALS_PROP] = true; + } catch (noSignals) { + process.env[SIGNALS_PROP] = false; } } @@ -150,7 +150,7 @@ daemonNames.forEach(function(dn) { }); }); -if (!process.env[SIGNALS_PROP]) { +if (process.env[SIGNALS_PROP]) { process.on('SIGINT', function () { console.log('\nSIGINT recieved! trying to shut down gracefully...'); Object.keys(daemons).forEach(function (k) { daemons[k].kill('SIGINT'); });