X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=61be6c2e29218d4e16c4bb0949c9c55d72cb0bac;hb=07c0e4af71ccf604089260449cc56a0fd058bdc1;hp=1a0f6ff2d76119f7907785187a94e0541be72079;hpb=db5688d8546c1387ece50f3ae76c3434367d6c12;p=prosody.git

diff --git a/prosody b/prosody
index 1a0f6ff2..61be6c2e 100755
--- a/prosody
+++ b/prosody
@@ -49,9 +49,6 @@ _G.prosody = prosody;
 
 -- Check dependencies
 local dependencies = require "util.dependencies";
-if not dependencies.check_dependencies() then
-	os.exit(1);
-end
 
 -- Load the config-parsing module
 config = require "core.configmanager"
@@ -86,6 +83,7 @@ function read_config()
 			break;
 		end
 	end
+	prosody.config_file = filename
 	local ok, level, err = config.load(filename);
 	if not ok then
 		print("\n");
@@ -115,8 +113,15 @@ function read_config()
 	end
 end
 
+function check_dependencies()
+	if not dependencies.check_dependencies() then
+		os.exit(1);
+	end
+end
+
 function load_libraries()
 	-- Load socket framework
+	socket = require "socket";
 	server = require "net.server"
 end	
 
@@ -147,9 +152,12 @@ function sandbox_require()
 	-- for neat sandboxing of modules
 	local _realG = _G;
 	local _real_require = require;
-	if not getfenv then
+	local getfenv = getfenv or function (f)
 		-- FIXME: This is a hack to replace getfenv() in Lua 5.2
-		function getfenv(f) return debug.getupvalue(debug.getinfo(f or 1).func, 1); end
+		local name, env = debug.getupvalue(debug.getinfo(f or 1).func, 1);
+		if name == "_ENV" then
+			return env;
+		end
 	end
 	function require(...)
 		local curr_env = getfenv(2);
@@ -240,7 +248,7 @@ function init_global_state()
 	function prosody.reload_config()
 		log("info", "Reloading configuration file");
 		prosody.events.fire_event("reloading-config");
-		local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua");
+		local ok, level, err = config.load(prosody.config_file);
 		if not ok then
 			if level == "parser" then
 				log("error", "There was an error parsing the configuration file: %s", tostring(err));
@@ -285,6 +293,7 @@ function load_secondary_libraries()
 	require "util.import"
 	require "util.xmppstream"
 	require "core.stanza_router"
+	require "core.statsmanager"
 	require "core.hostmanager"
 	require "core.portmanager"
 	require "core.modulemanager"
@@ -381,6 +390,7 @@ init_logging();
 sanity_check();
 sandbox_require();
 set_function_metatable();
+check_dependencies();
 load_libraries();
 init_global_state();
 read_version();