From: daurnimator <quae@daurnimator.com>
Date: Wed, 22 Oct 2014 20:00:40 +0000 (-0400)
Subject: net/server: Handle lack of util.signal correctly
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=af0f5cd2ebf60960e51dc1649c091f0512bee498;hp=e309695e1fe9ae0f25d16204bbe84fec94d024d2;p=prosody.git

net/server: Handle lack of util.signal correctly
---

diff --git a/net/server.lua b/net/server.lua
index 9f24b0a6..a753a19c 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -66,9 +66,9 @@ else
 end
 
 -- If server.hook_signal exists, replace signal.signal()
-local ok, signal = pcall(require, "util.signal");
-if server.hook_signal then
-	if ok then
+local has_signal, signal = pcall(require, "util.signal");
+if has_signal then
+	if server.hook_signal then
 		function signal.signal(signal_id, handler)
 			if type(signal_id) == "string" then
 				signal_id = signal[signal_id:upper()];
@@ -78,9 +78,15 @@ if server.hook_signal then
 			end
 			return server.hook_signal(signal_id, handler);
 		end
+	else
+		server.hook_signal = signal.signal;
 	end
 else
-	server.hook_signal = signal.signal;
+	if not server.hook_signal then
+		server.hook_signal = function()
+			return false, "signal hooking not supported"
+		end
+	end
 end
 
 if prosody then