diff net/server.lua @ 11200:bf8f2da84007

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 05 Nov 2020 22:31:25 +0100
parents 0107ed6744aa
children 54530085dffe
line wrap: on
line diff
--- a/net/server.lua	Thu Nov 05 22:27:17 2020 +0100
+++ b/net/server.lua	Thu Nov 05 22:31:25 2020 +0100
@@ -13,7 +13,11 @@
 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";