util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index f77b216d5568e199f9576256aaefa7a99ab8544e..971e17669f5f282109fddab8e9c61f26f0deba59 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -23,6 +23,22 @@ if use_luaevent then
        function server.addtimer(f)
                return add_task(1, function (...) f(...); return 1; end);
        end
+       
+       -- Overwrite signal.signal() because we need to ask libevent to
+       -- handle them instead
+       local ok, signal = pcall(require, "util.signal");
+       if ok and signal then
+               local _signal_signal = signal.signal;
+               function signal.signal(signal_id, handler)
+                       if type(signal_id) == "string" then
+                               signal_id = signal[signal_id:upper()];
+                       end
+                       if type(signal_id) ~= "number" then
+                               return false, "invalid-signal";
+                       end
+                       return server.hook_signal(signal_id, handler);
+               end
+       end
 else
        server = require "net.server_select";
        package.loaded["net.server"] = server;
@@ -30,4 +46,4 @@ end
 
 -- require "net.server" shall now forever return this,
 -- ie. server_select or server_event as chosen above.
-return server; 
+return server;