net.server_event: Add lock_read() method to connections

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index 507bd81e45beb5672bab72912b3fa7edd6322547..971e17669f5f282109fddab8e9c61f26f0deba59 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -1,21 +1,49 @@
-local have_luaevent = pcall(require, "luaevent.core");
+
 local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent");
 
+if use_luaevent then
+       use_luaevent = pcall(require, "luaevent.core");
+       if not use_luaevent then
+               log("error", "libevent not found, falling back to select()");
+       end
+end
+
 local server;
 
-if have_luaevent and use_luaevent == true then
+if use_luaevent then
        server = require "net.server_event";
+       -- util.timer requires "net.server", so instead of having
+       -- Lua look for, and load us again (causing a loop) - set this here
+       -- (usually it isn't set until we return, look down there...)
        package.loaded["net.server"] = server;
        
        -- Backwards compatibility for timers, addtimer
        -- called a function roughly every second
-       local add_task = require "util.timer";
+       local add_task = require "util.timer".add_task;
        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;
 end
 
+-- require "net.server" shall now forever return this,
+-- ie. server_select or server_event as chosen above.
 return server;