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 a23257358c5a3af3f09b8180956e2e725776b04e..f77b216d5568e199f9576256aaefa7a99ab8544e 100644 (file)
--- a/net/server.lua
+++ b/net/server.lua
@@ -1,9 +1,16 @@
-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