Mercurial > prosody-hg

comparison main.lua @ 282:80e7de32b618

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging my new SASL code with Waqas' adjusted saslauth module.
author Tobias Markmann <tm@ayena.de>
date Sat, 15 Nov 2008 13:47:17 +0100
parents 182f0c895676
children 8fbfa8f885a6
comparison
equal deleted inserted replaced
280:516f4c901991 282:80e7de32b618
15 sessions = {}; 15 sessions = {};
16 hosts = {}; 16 hosts = {};
17 17
18 if config.hosts and #config.hosts > 0 then 18 if config.hosts and #config.hosts > 0 then
19 for _, host in pairs(config.hosts) do 19 for _, host in pairs(config.hosts) do
20 hosts[host] = {type = "local", connected = true, sessions = {}, host = host}; 20 hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
21 end 21 end
22 else error("No hosts defined in the configuration file"); end 22 else error("No hosts defined in the configuration file"); end
23 23
24 -- Load and initialise core modules -- 24 -- Load and initialise core modules --
25 25
29 require "core.offlinemessage" 29 require "core.offlinemessage"
30 require "core.modulemanager" 30 require "core.modulemanager"
31 require "core.usermanager" 31 require "core.usermanager"
32 require "core.sessionmanager" 32 require "core.sessionmanager"
33 require "core.stanza_router" 33 require "core.stanza_router"
34
35 pcall(require, "remdebug.engine");
36 if remdebug then remdebug.engine.start() end
34 37
35 local start = require "net.connlisteners".start; 38 local start = require "net.connlisteners".start;
36 require "util.stanza" 39 require "util.stanza"
37 require "util.jid" 40 require "util.jid"
38 41