aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-03-29 16:57:18 +0200
committerKim Alvefur <zash@zash.se>2018-03-29 16:57:18 +0200
commit9974612a934f22f94bf8ce57002a3a192c1dd5c1 (patch)
tree2eee259d7de583d18b16b07ffb2a1e2f2f8ec7de
parentc67280b951d18b3ec4311a858977c9f970db9a1f (diff)
downloadprosody-9974612a934f22f94bf8ce57002a3a192c1dd5c1.tar.gz
prosody-9974612a934f22f94bf8ce57002a3a192c1dd5c1.zip
Backed out changeset a0f728c3aa69 in favor of 580c13ed0ca1
-rw-r--r--net/server.lua10
1 files changed, 3 insertions, 7 deletions
diff --git a/net/server.lua b/net/server.lua
index 76b06a2c..8b6fbc0b 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -6,13 +6,9 @@
-- COPYING file in the source package for more information.
--
-local server_type = "select";
-local ok, configmanager = pcall(require, "core.configmanager");
-if ok then
- server_type = configmanager.get("*", "network_backend") or "select";
- if require "core.configmanager".get("*", "use_libevent") then
- server_type = "event";
- end
+local server_type = prosody and require "core.configmanager".get("*", "network_backend") or "select";
+if prosody and require "core.configmanager".get("*", "use_libevent") then
+ server_type = "event";
end
if server_type == "event" then