diff options
| author | Kim Alvefur <zash@zash.se> | 2018-03-29 16:57:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-03-29 16:57:18 +0200 |
| commit | 3c8840746319e6e929c8fd3d670d8fb1ac99c767 (patch) | |
| tree | 2eee259d7de583d18b16b07ffb2a1e2f2f8ec7de | |
| parent | a1dfe2d935f8b2d13979efd39e9703ccdcd5bbcd (diff) | |
| download | prosody-3c8840746319e6e929c8fd3d670d8fb1ac99c767.tar.gz prosody-3c8840746319e6e929c8fd3d670d8fb1ac99c767.zip | |
Backed out changeset a0f728c3aa69 in favor of 580c13ed0ca1
| -rw-r--r-- | net/server.lua | 10 |
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 |