aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-08-28 09:23:24 +0100
committerMatthew Wild <mwild1@gmail.com>2014-08-28 09:23:24 +0100
commit878efeecd5030048b33121b05c6cf402f860ca1d (patch)
tree29a8b368a2ebd36175100726d9d02b82b27edc8c /core
parent6007de18c4db1acae2bb17c9d2aaad3b1ef994f5 (diff)
parentb27e7b3834519214f9b3c9e6e041421429bbcc74 (diff)
downloadprosody-878efeecd5030048b33121b05c6cf402f860ca1d.tar.gz
prosody-878efeecd5030048b33121b05c6cf402f860ca1d.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
-rw-r--r--core/modulemanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index b5674ece..db4c6bd0 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -123,7 +123,7 @@ local function do_load_module(host, module_name, state)
end
if modulemap[host][module_name] then
- log("warn", "%s is already loaded for %s, so not loading again", module_name, host);
+ log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
return nil, "module-already-loaded";
elseif modulemap["*"][module_name] then
local mod = modulemap["*"][module_name];