prosody
769a3577dd85
core/modulemanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

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
comparison
equal deleted inserted replaced
6355:c2d144d3f8dd 6367:769a3577dd85
121 if not modulemap[host] then 121 if not modulemap[host] then
122 modulemap[host] = hosts[host].modules; 122 modulemap[host] = hosts[host].modules;
123 end 123 end
124 124
125 if modulemap[host][module_name] then 125 if modulemap[host][module_name] then
126 log("warn", "%s is already loaded for %s, so not loading again", module_name, host); 126 log("debug", "%s is already loaded for %s, so not loading again", module_name, host);
127 return nil, "module-already-loaded"; 127 return nil, "module-already-loaded";
128 elseif modulemap["*"][module_name] then 128 elseif modulemap["*"][module_name] then
129 local mod = modulemap["*"][module_name]; 129 local mod = modulemap["*"][module_name];
130 if module_has_method(mod, "add_host") then 130 if module_has_method(mod, "add_host") then
131 local _log = logger.init(host..":"..module_name); 131 local _log = logger.init(host..":"..module_name);