From 1f74845db7945a874ef308a9fe32edce4b2ed7fc Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 9 Apr 2014 20:46:39 +0200
Subject: prosody: Check dependencies later in the startup sequence

---
 prosody | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'prosody')

diff --git a/prosody b/prosody
index ee2baca5..446dbfb7 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"
@@ -116,6 +113,12 @@ 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
 	server = require "net.server"
@@ -388,6 +391,7 @@ init_logging();
 sanity_check();
 sandbox_require();
 set_function_metatable();
+check_dependencies();
 load_libraries();
 init_global_state();
 read_version();
-- 
cgit v1.2.3