diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-09 20:46:39 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-09 20:46:39 +0200 |
commit | 1f74845db7945a874ef308a9fe32edce4b2ed7fc (patch) | |
tree | 7b912af63b31f8298095e489e9a6bbce7825435d /prosody | |
parent | 32b9b7ff472476c74c5e0d83b8712066b8de0d39 (diff) | |
download | prosody-1f74845db7945a874ef308a9fe32edce4b2ed7fc.tar.gz prosody-1f74845db7945a874ef308a9fe32edce4b2ed7fc.zip |
prosody: Check dependencies later in the startup sequence
Diffstat (limited to 'prosody')
-rwxr-xr-x | prosody | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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(); |