aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-11 11:31:14 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-11 11:31:14 +0000
commitc6b03a6b3571375252e092330af9afab91a70553 (patch)
tree3c83493edc748026a738d796759480333df32661 /prosodyctl
parent2294aed6cee3834786136fd0fc1df84e685c5889 (diff)
downloadprosody-c6b03a6b3571375252e092330af9afab91a70553.tar.gz
prosody-c6b03a6b3571375252e092330af9afab91a70553.zip
prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Diffstat (limited to 'prosodyctl')
-rwxr-xr-xprosodyctl12
1 files changed, 6 insertions, 6 deletions
diff --git a/prosodyctl b/prosodyctl
index 70474900..9d2df69e 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -29,12 +29,6 @@ if CFG_DATADIR then
end
end
-require "core.loggingmanager"
-
-if not require "util.dependencies".check_dependencies() then
- os.exit(1);
-end
-
config = require "core.configmanager"
do
@@ -63,6 +57,12 @@ do
end
end
+require "core.loggingmanager"
+
+if not require "util.dependencies".check_dependencies() then
+ os.exit(1);
+end
+
prosody = { hosts = {}, events = events, platform = "posix" };
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";