From 82ff7c2f200f67d2d02595f43191cbbfbe121418 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 25 Jul 2012 10:53:22 +0100
Subject: [PATCH] Instead of using the NO_SIGNALS environment variable, use
SUPPORTS_SIGNALS
---
lib/shutdown.js | 2 +-
scripts/run_locally.js | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/shutdown.js b/lib/shutdown.js
index 24a18711e..150ed351f 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 d602f22fd..7aad2a27f 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'); });
--
GitLab