Mercurial > prosody-hg

comparison core/modulemanager.lua @ 6038:b3ceb7627e27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Tue, 25 Mar 2014 19:16:38 +0100
parents 28a90f5fea46 ee14da71d3fc
children 92d009af6eba
comparison
equal deleted inserted replaced
6037:7bbe22d8dd09 6038:b3ceb7627e27
28 local params = {...}; 28 local params = {...};
29 return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end); 29 return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end);
30 end 30 end
31 31
32 local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"}; 32 local autoload_modules = {prosody.platform, "presence", "message", "iq", "offline", "c2s", "s2s"};
33 local component_inheritable_modules = {"tls", "dialback", "iq", "s2s"}; 33 local component_inheritable_modules = {"tls", "saslauth", "dialback", "iq", "s2s"};
34 34
35 -- We need this to let modules access the real global namespace 35 -- We need this to let modules access the real global namespace
36 local _G = _G; 36 local _G = _G;
37 37
38 module "modulemanager" 38 module "modulemanager"