prosody
c37f971f0fe6
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 2587:c37f971f0fe6

prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
author Matthew Wild <mwild1@gmail.com>
date Thu, 11 Feb 2010 11:31:14 +0000
parent 2566:48dfd5c9dc5d
child 2696:cb5acafbec62
comparison
equal deleted inserted replaced
2586:26ead5e16cd3 2587:c37f971f0fe6
25 25
26 if CFG_DATADIR then 26 if CFG_DATADIR then
27 if os.getenv("HOME") then 27 if os.getenv("HOME") then
28 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); 28 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
29 end 29 end
30 end
31
32 require "core.loggingmanager"
33
34 if not require "util.dependencies".check_dependencies() then
35 os.exit(1);
36 end 30 end
37 31
38 config = require "core.configmanager" 32 config = require "core.configmanager"
39 33
40 do 34 do
61 print(""); 55 print("");
62 os.exit(1); 56 os.exit(1);
63 end 57 end
64 end 58 end
65 59
60 require "core.loggingmanager"
61
62 if not require "util.dependencies".check_dependencies() then
63 os.exit(1);
64 end
65
66 prosody = { hosts = {}, events = events, platform = "posix" }; 66 prosody = { hosts = {}, events = events, platform = "posix" };
67 67
68 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; 68 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
69 require "util.datamanager".set_data_path(data_path); 69 require "util.datamanager".set_data_path(data_path);
70 70