aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-09 20:46:39 +0200
committerKim Alvefur <zash@zash.se>2014-04-09 20:46:39 +0200
commit28e75923a0740236d865c5bbf30cf19fee25ec28 (patch)
tree7b912af63b31f8298095e489e9a6bbce7825435d
parent1d5276058b9fd26db59cf894d926ec3e6d3f1ec8 (diff)
downloadprosody-28e75923a0740236d865c5bbf30cf19fee25ec28.tar.gz
prosody-28e75923a0740236d865c5bbf30cf19fee25ec28.zip
prosody: Check dependencies later in the startup sequence
-rwxr-xr-xprosody10
1 files changed, 7 insertions, 3 deletions
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();