Software / code / prosody
Comparison
core/modulemanager.lua @ 4565:5a2212d3468e
modulemanager: include mod_c2s and mod_s2s into autoloaded modules.
| author | Florian Zeitz <florob@babelmonkeys.de> |
|---|---|
| date | Fri, 24 Feb 2012 15:14:07 +0000 |
| parent | 4537:d8d257c13562 |
| child | 4604:eef5e3a83792 |
comparison
equal
deleted
inserted
replaced
| 4557:2abe4e541d52 | 4565:5a2212d3468e |
|---|---|
| 32 return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end); | 32 return xpcall(function() return f(unpack(params, 1, n)) end, function(e) return tostring(e).."\n"..debug_traceback(); end); |
| 33 end | 33 end |
| 34 | 34 |
| 35 local array, set = require "util.array", require "util.set"; | 35 local array, set = require "util.array", require "util.set"; |
| 36 | 36 |
| 37 local autoload_modules = {"presence", "message", "iq", "offline"}; | 37 local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"}; |
| 38 local component_inheritable_modules = {"tls", "dialback", "iq"}; | 38 local component_inheritable_modules = {"tls", "dialback", "iq"}; |
| 39 | 39 |
| 40 -- We need this to let modules access the real global namespace | 40 -- We need this to let modules access the real global namespace |
| 41 local _G = _G; | 41 local _G = _G; |
| 42 | 42 |