diff options
author | Kim Alvefur <zash@zash.se> | 2018-03-29 16:36:18 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-03-29 16:36:18 +0200 |
commit | a1dfe2d935f8b2d13979efd39e9703ccdcd5bbcd (patch) | |
tree | f3fbfc88134a71eef95ef8fdf26cde91a985f35e /util | |
parent | 13513b9679251f694fa96a4058f5de4e3200caf8 (diff) | |
download | prosody-a1dfe2d935f8b2d13979efd39e9703ccdcd5bbcd.tar.gz prosody-a1dfe2d935f8b2d13979efd39e9703ccdcd5bbcd.zip |
util.startup: Initialize the 'prosody' global earlier (various things needs the global util.events instance)
Diffstat (limited to 'util')
-rw-r--r-- | util/startup.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/startup.lua b/util/startup.lua index a33f3f3b..69511bf9 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -496,8 +496,8 @@ end -- prosodyctl only function startup.prosodyctl() - startup.read_config(); startup.init_global_state(); + startup.read_config(); startup.setup_plugindir(); startup.setup_datadir(); startup.chdir(); @@ -517,13 +517,13 @@ end 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(); |