Software / code / prosody
Diff
core/modulemanager.lua @ 6367:769a3577dd85
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Aug 2014 09:23:24 +0100 |
| parent | 6319:92d009af6eba |
| parent | 6361:f12889981ece |
| child | 6415:010b141e91ed |
line wrap: on
line diff
--- a/core/modulemanager.lua Wed Aug 27 13:00:04 2014 +0200 +++ b/core/modulemanager.lua Thu Aug 28 09:23:24 2014 +0100 @@ -123,7 +123,7 @@ 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];
