From a1dfe2d935f8b2d13979efd39e9703ccdcd5bbcd Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Thu, 29 Mar 2018 16:36:18 +0200
Subject: util.startup: Initialize the 'prosody' global earlier (various things
 needs the global util.events instance)

---
 util/startup.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'util')

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();
-- 
cgit v1.2.3