aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-08-28 12:05:18 +0100
committerMatthew Wild <mwild1@gmail.com>2014-08-28 12:05:18 +0100
commit580f0a2a97b67c80dcb77d386bf469912c5ddfcb (patch)
treef9b41c73e3cda1b1f3ffe63a3921967eea4a20d6 /core
parentaf8588572ea3aef8d7c799315adaaf7c7bb64c4f (diff)
parente5cad1e21d8d45fb12dc0f3d53767c7fb875c96c (diff)
downloadprosody-580f0a2a97b67c80dcb77d386bf469912c5ddfcb.tar.gz
prosody-580f0a2a97b67c80dcb77d386bf469912c5ddfcb.zip
Merge 0.10->trunk
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];