projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8e9ad79
)
modulemanager: Silence log message about attempts to load already loaded modules...
author
Kim Alvefur
<zash@zash.se>
Sat, 19 Mar 2016 15:35:43 +0000
(16:35 +0100)
committer
Kim Alvefur
<zash@zash.se>
Sat, 19 Mar 2016 15:35:43 +0000
(16:35 +0100)
core/modulemanager.lua
patch
|
blob
|
history
diff --git
a/core/modulemanager.lua
b/core/modulemanager.lua
index 65542f9a0313315cd16a80d1898eea48b15e139f..7bed17950e0c435eeac929d4cde535c153a00649 100644
(file)
--- 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];