mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Matthew Wild 2014-08-28 09:23:24 +01:00
commit 878efeecd5
10 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/modulemanager.lua
View file

@ -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];