Mercurial > prosody-hg

comparison main.lua @ 412:b5b4ec28feec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change loading order of modules, config before dependency checking
author Matthew Wild <mwild1@gmail.com>
date Tue, 25 Nov 2008 03:50:08 +0000
parents eb1a0960cefb
children afbf29498123
comparison
equal deleted inserted replaced
411:64982773cc15 412:b5b4ec28feec
1 pcall(require, "luarocks.require") 1 pcall(require, "luarocks.require")
2 2
3 local server = require "net.server"
4 local config = require "core.configmanager" 3 local config = require "core.configmanager"
5
6 require "util.dependencies"
7
8 log = require "util.logger".init("general"); 4 log = require "util.logger".init("general");
9 5
10 do 6 do
11 -- TODO: Check for other formats when we add support for them 7 -- TODO: Check for other formats when we add support for them
12 -- Use lfs? Make a new conf/ dir? 8 -- Use lfs? Make a new conf/ dir?
25 config.set("*", "core", "modules_enabled", _G.config.modules); 21 config.set("*", "core", "modules_enabled", _G.config.modules);
26 config.set("*", "core", "ssl", _G.config.ssl_ctx); 22 config.set("*", "core", "ssl", _G.config.ssl_ctx);
27 end 23 end
28 end 24 end
29 end 25 end
26
27 local server = require "net.server"
28
29 require "util.dependencies"
30 30
31 -- Maps connections to sessions -- 31 -- Maps connections to sessions --
32 sessions = {}; 32 sessions = {};
33 hosts = {}; 33 hosts = {};
34 34