diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
| commit | 983891c9fa8e728aa4680aedc74ec50a0329346e (patch) | |
| tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/modulemanager.lua | |
| parent | 4adcfb2d185bb95ec430822c772f091b713faa7a (diff) | |
| parent | 869da6c240dccfed8c43228ceb989af5faf6c8f1 (diff) | |
| download | prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.tar.gz prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/modulemanager.lua')
| -rw-r--r-- | core/modulemanager.lua | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 4ba2c27e..35b9d0e5 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -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 |