aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-26 21:41:11 +0200
committerKim Alvefur <zash@zash.se>2015-09-26 21:41:11 +0200
commit36b5ae5e248a7f38aff69987adc07c093c75f17b (patch)
tree807b3af57cd7b71ca01cbd80fe112e1dadb4199a
parentb456d66edb94ee5d10524e94606a5980dcb3c9c1 (diff)
downloadprosody-36b5ae5e248a7f38aff69987adc07c093c75f17b.tar.gz
prosody-36b5ae5e248a7f38aff69987adc07c093c75f17b.zip
mod_posix: Detect failure to load util.signal by first pcall return value not by type of the second
-rw-r--r--plugins/mod_posix.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index e9e43fa0..7e6d8799 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -14,8 +14,8 @@ if pposix._VERSION ~= want_pposix_version then
module:log("warn", "Unknown version (%s) of binary pposix module, expected %s. Perhaps you need to recompile?", tostring(pposix._VERSION), want_pposix_version);
end
-local signal = select(2, pcall(require, "util.signal"));
-if type(signal) == "string" then
+local have_signal, signal = pcall(require, "util.signal");
+if not have_signal then
module:log("warn", "Couldn't load signal library, won't respond to SIGTERM");
end
@@ -162,7 +162,7 @@ end
module:hook("server-stopped", remove_pidfile);
-- Set signal handlers
-if signal.signal then
+if have_signal then
signal.signal("SIGTERM", function ()
module:log("warn", "Received SIGTERM");
prosody.unlock_globals();