prosody
d611c46c6787
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/server.lua @ 8700:d611c46c6787

Backed out changeset a0f728c3aa69 in favor of 580c13ed0ca1
author Kim Alvefur <zash@zash.se>
date Thu, 29 Mar 2018 16:57:18 +0200
parent 8686:a0f728c3aa69
child 8711:9932a2a5b6de
line wrap: on
line diff
--- a/net/server.lua	Thu Mar 29 16:36:18 2018 +0200
+++ b/net/server.lua	Thu Mar 29 16:57:18 2018 +0200
@@ -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