projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e309695
)
net/server: Handle lack of util.signal correctly
author
daurnimator
<quae@daurnimator.com>
Wed, 22 Oct 2014 20:00:40 +0000
(16:00 -0400)
committer
daurnimator
<quae@daurnimator.com>
Wed, 22 Oct 2014 20:00:40 +0000
(16:00 -0400)
net/server.lua
patch
|
blob
|
history
diff --git
a/net/server.lua
b/net/server.lua
index 9f24b0a6ef26b03ec33cc8737baf818ae40ae08a..a753a19c8056e7fb7e75c6d6c13ac3ffab0d02cd 100644
(file)
--- a/
net/server.lua
+++ b/
net/server.lua
@@
-66,9
+66,9
@@
else
end
-- If server.hook_signal exists, replace signal.signal()
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()];
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
end
return server.hook_signal(signal_id, handler);
end
+ else
+ server.hook_signal = signal.signal;
end
else
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
end
if prosody then