util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns

[prosody.git] / net / server.lua

diff --git a/net/server.lua b/net/server.lua
index 507bd81e45beb5672bab72912b3fa7edd6322547..f77b216d5568e199f9576256aaefa7a99ab8544e 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -1,15 +1,25 @@
-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
@@ -18,4 +28,6 @@ else
        package.loaded["net.server"] = server;
 end
 
-return server;
+-- require "net.server" shall now forever return this,
+-- ie. server_select or server_event as chosen above.
+return server;