Merge from waqas

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 1382e227d6be5ef46d826aba2c2b14ed68451c03..3c27e7a05ced771bd935201f0a2f58cca2b1b9ac 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -44,7 +44,7 @@ module "modulemanager"
 
 local api = {}; -- Module API container
 
-local modulemap = {};
+local modulemap = { ["*"] = {} };
 
 local stanza_handlers = multitable_new();
 local handler_info = {};
@@ -67,19 +67,23 @@ function load(host, module_name, config)
        if not (host and module_name) then
                return nil, "insufficient-parameters";
        end
-       local mod, err = loadfile(plugin_dir.."mod_"..module_name..".lua");
-       if not mod then
-               log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
-               return nil, err;
-       end
        
        if not modulemap[host] then
                modulemap[host] = {};
        elseif modulemap[host][module_name] then
                log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
                return nil, "module-already-loaded";
+       elseif modulemap["*"][module_name] then
+               return nil, "global-module-already-loaded";
        end
        
+
+       local mod, err = loadfile(plugin_dir.."mod_"..module_name..".lua");
+       if not mod then
+               log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
+               return nil, err;
+       end
+
        local _log = logger.init(host..":"..module_name);
        local api_instance = setmetatable({ name = module_name, host = host, config = config,  _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
 
@@ -93,7 +97,8 @@ function load(host, module_name, config)
                return nil, ret;
        end
        
-       modulemap[host][module_name] = mod;
+       -- Use modified host, if the module set one
+       modulemap[api_instance.host][module_name] = mod;
        
        return true;
 end