prosody

changeset 2565
a0d22b6a3144
parent 2553
c3afa1e02e8f
child 2567
ca6ee2dac8d6
equal deleted inserted replaced
2564:6b4fe320a6ea 2565:a0d22b6a3144
29 if CFG_DATADIR then 29 if CFG_DATADIR then
30 if os.getenv("HOME") then 30 if os.getenv("HOME") then
31 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); 31 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
32 end 32 end
33 end 33 end
34
35 -- Initialize logging
36 require "core.loggingmanager"
34 37
35 -- Check runtime dependencies 38 -- Check runtime dependencies
36 if not require "util.dependencies".check_dependencies() then 39 if not require "util.dependencies".check_dependencies() then
37 os.exit(1); 40 os.exit(1);
38 end 41 end
110 os.exit(1); 113 os.exit(1);
111 end 114 end
112 end 115 end
113 116
114 function load_libraries() 117 function load_libraries()
115 -- Initialize logging
116 require "core.loggingmanager"
117
118 -- Load socket framework 118 -- Load socket framework
119 server = require "net.server" 119 server = require "net.server"
120 end 120 end
121 121
122 function init_global_state() 122 function init_global_state()

mercurial