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

core.*: Complete removal of all traces of the "core" section and section-related code.

Browse source
This commit is contained in:
Kim Alvefur 2013-03-23 02:33:15 +01:00
parent 974917a5a2
commit 1acfdf5914
7 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/modulemanager.lua
View file

@ -44,12 +44,12 @@ local modulemap = { ["*"] = {} };
-- Load modules when a host is activated
function load_modules_for_host(host)
local component = config.get(host, "core", "component_module");
local component = config.get(host, "component_module");
local global_modules_enabled = config.get("*", "core", "modules_enabled");
local global_modules_disabled = config.get("*", "core", "modules_disabled");
local host_modules_enabled = config.get(host, "core", "modules_enabled");
local host_modules_disabled = config.get(host, "core", "modules_disabled");
local global_modules_enabled = config.get("*", "modules_enabled");
local global_modules_disabled = config.get("*", "modules_disabled");
local host_modules_enabled = config.get(host, "modules_enabled");
local host_modules_disabled = config.get(host, "modules_disabled");
if host_modules_enabled == global_modules_enabled then host_modules_enabled = nil; end
if host_modules_disabled == global_modules_disabled then host_modules_disabled = nil; end
@ -218,7 +218,7 @@ local function do_reload_module(host, name)
saved = ret;
else
log("warn", "Error saving module '%s:%s' state: %s", host, name, ret);
if not config.get(host, "core", "force_module_reload") then
if not config.get(host, "force_module_reload") then
log("warn", "Aborting reload due to error, set force_module_reload to ignore this");
return nil, "save-state-failed";
else