Software / code / prosody
Changeset
6066:95b3a59d7932
prosody: Check dependencies later in the startup sequence
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 09 Apr 2014 20:46:39 +0200 |
| parents | 6065:9ab23488a17c |
| children | 6067:dab7ad6fa23c 6147:852bd69ba148 |
| files | prosody |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/prosody Wed Apr 09 14:01:02 2014 -0400 +++ b/prosody Wed Apr 09 20:46:39 2014 +0200 @@ -49,9 +49,6 @@ -- 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 @@ 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 @@ sanity_check(); sandbox_require(); set_function_metatable(); +check_dependencies(); load_libraries(); init_global_state(); read_version();
