mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server: Handle loading from outside Prosody (e.g. Verse)

Browse source 
server_select only depending on LuaSocket generally makes it more
portable, so fall back to that if util.poll can't be found.
This commit is contained in:
Kim Alvefur 2023-05-20 20:44:20 +02:00
parent af2cf5f188
commit c468bd12c9
1 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

35
net/server.lua
View file

@ -6,20 +6,23 @@
-- COPYING file in the source package for more information. -- COPYING file in the source package for more information.
-- --
if not (prosody and prosody.config_loaded) then local function log(level, format, ...)
-- This module only supports loading inside Prosody, outside Prosody print("net.server", level, format:format(...));
-- you should directly require net.server_select or server_event, etc.
error(debug.traceback("Loading outside Prosody or Prosody not yet initialized"), 0);
end end
local log = require "prosody.util.logger".init("net.server"); local default_backend = "select";
local server_type = default_backend;
local default_backend = "epoll"; if (prosody and prosody.config_loaded) then
default_backend = "epoll";
log = require"prosody.util.logger".init("net.server");
server_type = require"prosody.core.configmanager".get("*", "network_backend") or default_backend;
local server_type = require "prosody.core.configmanager".get("*", "network_backend") or default_backend; if require"prosody.core.configmanager".get("*", "use_libevent") then
server_type = "event";
if require "prosody.core.configmanager".get("*", "use_libevent") then end
server_type = "event"; elseif pcall(require, "prosody.util.poll") then
server_type = "epoll";
end end
if server_type == "event" then if server_type == "event" then
@ -118,11 +121,13 @@ if prosody and set_config then
prosody.events.add_handler("config-reloaded", load_config); prosody.events.add_handler("config-reloaded", load_config);
end end
local tls_builder = server.tls_builder; if prosody and server.tls_builder then
-- resolving the basedir here avoids util.sslconfig depending on local tls_builder = server.tls_builder;
-- prosody.paths.config -- resolving the basedir here avoids util.sslconfig depending on
function server.tls_builder() -- prosody.paths.config
return tls_builder(prosody.paths.config or "") function server.tls_builder()
return tls_builder(prosody.paths.config or "")
end
end end
-- require "prosody.net.server" shall now forever return this, -- require "prosody.net.server" shall now forever return this,