Software / code / prosody
Changeset
8699:580c13ed0ca1
util.startup: Initialize the 'prosody' global earlier (various things needs the global util.events instance)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 29 Mar 2018 16:36:18 +0200 |
| parents | 8698:0499f3da0ec4 |
| children | 8700:d611c46c6787 |
| files | util/startup.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/util/startup.lua Thu Mar 29 16:27:11 2018 +0200 +++ b/util/startup.lua Thu Mar 29 16:36:18 2018 +0200 @@ -496,8 +496,8 @@ -- prosodyctl only function startup.prosodyctl() + startup.init_global_state(); startup.read_config(); - startup.init_global_state(); startup.setup_plugindir(); startup.setup_datadir(); startup.chdir(); @@ -517,13 +517,13 @@ function startup.prosody() -- These actions are in a strict order, as many depend on -- previous steps to have already been performed + startup.init_global_state(); startup.read_config(); startup.sanity_check(); startup.sandbox_require(); startup.set_function_metatable(); startup.check_dependencies(); startup.load_libraries(); - startup.init_global_state(); startup.setup_plugindir(); startup.setup_datadir(); startup.init_logging();
