aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-19 22:46:41 +0100
committerKim Alvefur <zash@zash.se>2016-03-19 22:46:41 +0100
commit44d0cf80e09f8c81a22ce91b9d9772bd47b2e4dc (patch)
treeaaaa5f3bc1025f1c9ba90c3c636e818c534316e7
parentc7e80a8b0191239b7d7103154d4c079868234e41 (diff)
parent487f77d6ef7b64fccb2bb73a0710c6e669399153 (diff)
downloadprosody-44d0cf80e09f8c81a22ce91b9d9772bd47b2e4dc.tar.gz
prosody-44d0cf80e09f8c81a22ce91b9d9772bd47b2e4dc.zip
Merge 0.10->trunk
-rw-r--r--core/modulemanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 65542f9a..7bed1795 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -125,7 +125,9 @@ local function do_load_module(host, module_name, state)
end
if modulemap[host][module_name] then
- log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+ if not modulemap["*"][module_name] then
+ log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
+ end
return nil, "module-already-loaded";
elseif modulemap["*"][module_name] then
local mod = modulemap["*"][module_name];