prosody: Check dependencies (and load LuaRocks) earlier on in the startup process

1 files changed, 4 insertions, 7 deletions

diff --git a/prosody b/prosody
index 52251dac..542787df 100755
--- a/prosody
+++ b/prosody
@@ -32,8 +32,10 @@ if CFG_DATADIR then
 	end
 end
 
--- Required to be able to find packages installed with luarocks
-pcall(require, "luarocks.require");
+-- Check runtime dependencies
+if not require "util.dependencies".check_dependencies() then
+	os.exit(1);
+end
 
 -- Replace require() with one that doesn't pollute _G, required
 -- for neat sandboxing of modules
@@ -113,11 +115,6 @@ function load_libraries()
 	-- Initialize logging
 	require "core.loggingmanager"
 	
-	-- Check runtime dependencies
-	if not require "util.dependencies".check_dependencies() then
-		os.exit(1);
-	end
-	
 	-- Load socket framework
 	server = require "net.server"
 end