From f769dbb2692f943f1c548a54d4f2e778aa11d35c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 23 Mar 2018 18:02:37 +0100 Subject: net.server: Try to require configmanager instead checking for the prosody global which does not yet exist when net.server is loaded now --- net/server.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'net/server.lua') diff --git a/net/server.lua b/net/server.lua index 8b6fbc0b..76b06a2c 100644 --- a/net/server.lua +++ b/net/server.lua @@ -6,9 +6,13 @@ -- COPYING file in the source package for more information. -- -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"; +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 end if server_type == "event" then -- cgit v1.2.3