diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
| commit | bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7 (patch) | |
| tree | 3a37db7b805b1555d08cc61c7938cf512ff35ce0 /net/server.lua | |
| parent | 2940b9c66f4a053dbe2ca038468a3a8791beccd5 (diff) | |
| parent | bd3bd2179be360f86c7db3fcd400dbb168fa8be5 (diff) | |
| download | prosody-bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7.tar.gz prosody-bf6c2db68257e8ac3a35e2c4e7c18b55313a5bf7.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/server.lua')
| -rw-r--r-- | net/server.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua index abbb421d..f5666594 100644 --- a/net/server.lua +++ b/net/server.lua @@ -13,7 +13,11 @@ if not (prosody and prosody.config_loaded) then end local log = require "util.logger".init("net.server"); -local server_type = require "core.configmanager".get("*", "network_backend") or "select"; + +local have_util_poll = pcall(require, "util.poll"); +local default_backend = have_util_poll and "epoll" or "select"; + +local server_type = require "core.configmanager".get("*", "network_backend") or default_backend; if require "core.configmanager".get("*", "use_libevent") then server_type = "event"; |