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

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-11-23 23:12:01 +01:00
commit 72f1544f6d
156 changed files with 6219 additions and 2102 deletions
Download patch file Download diff file Expand all files Collapse all files

25
core/modulemanager.lua
View file

@ -23,8 +23,24 @@ local debug_traceback = debug.traceback;
local setmetatable, rawget = setmetatable, rawget;
local ipairs, pairs, type, t_insert = ipairs, pairs, type, table.insert;
local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s", "s2s_auth_certs"};
local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
local autoload_modules = {
prosody.platform,
"presence",
"message",
"iq",
"offline",
"c2s",
"s2s",
"s2s_auth_certs",
};
local component_inheritable_modules = {
"tls",
"saslauth",
"dialback",
"iq",
"s2s",
"s2s_bidi",
};
-- We need this to let modules access the real global namespace
local _G = _G;
@ -174,6 +190,7 @@ local function do_load_module(host, module_name, state)
local mod, err = pluginloader.load_code(module_name, nil, pluginenv);
if not mod then
log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
api_instance:set_status("error", "Failed to load (see log)");
return nil, err;
end
@ -187,6 +204,7 @@ local function do_load_module(host, module_name, state)
ok, err = call_module_method(pluginenv, "load");
if not ok then
log("warn", "Error loading module '%s' on '%s': %s", module_name, host, err or "nil");
api_instance:set_status("warn", "Error during load (see log)");
end
end
api_instance.reloading, api_instance.saved_state = nil, nil;
@ -209,6 +227,9 @@ local function do_load_module(host, module_name, state)
if not ok then
modulemap[api_instance.host][module_name] = nil;
log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
api_instance:set_status("warn", "Error during load (see log)");
else
api_instance:set_status("core", "Loaded", false);
end
return ok and pluginenv, err;
end