aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-25 03:50:08 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-25 03:50:08 +0000
commitf86f6bc13d458728763b29148750098d9f8846cd (patch)
tree3373c216ce295bb6da4fe4a56c2a9708a6b74688
parentf186939185c9cb2e2b8d1db876cdfd43db1f77b2 (diff)
downloadprosody-f86f6bc13d458728763b29148750098d9f8846cd.tar.gz
prosody-f86f6bc13d458728763b29148750098d9f8846cd.zip
Change loading order of modules, config before dependency checking
-rw-r--r--main.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/main.lua b/main.lua
index 1a8c4295..1513763e 100644
--- a/main.lua
+++ b/main.lua
@@ -1,10 +1,6 @@
pcall(require, "luarocks.require")
-local server = require "net.server"
local config = require "core.configmanager"
-
-require "util.dependencies"
-
log = require "util.logger".init("general");
do
@@ -28,6 +24,10 @@ do
end
end
+local server = require "net.server"
+
+require "util.dependencies"
+
-- Maps connections to sessions --
sessions = {};
hosts = {};