# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1523389145 -3600
# Node ID 2fdeb979cc7c7cdf4a8215a7ec8736cc0ac121e5
# Parent  f91d45a692f08a2d39b78b0453ae6d9251379405
util.startup: Initialize logging immediately after configuration is read (which is how it used to work)

diff -r f91d45a692f0 -r 2fdeb979cc7c util/startup.lua
--- a/util/startup.lua	Tue Apr 10 20:34:29 2018 +0100
+++ b/util/startup.lua	Tue Apr 10 20:39:05 2018 +0100
@@ -505,6 +505,7 @@
 function startup.prosodyctl()
 	startup.init_global_state();
 	startup.read_config();
+	startup.init_logging();
 	startup.setup_plugindir();
 	startup.setup_datadir();
 	startup.chdir();
@@ -512,7 +513,6 @@
 	startup.switch_user();
 	startup.check_dependencies();
 	startup.force_console_logging();
-	startup.init_logging();
 	startup.log_dependency_warnings();
 	startup.check_unwriteable();
 	startup.load_libraries();
@@ -526,6 +526,7 @@
 	-- previous steps to have already been performed
 	startup.init_global_state();
 	startup.read_config();
+	startup.init_logging();
 	startup.sanity_check();
 	startup.sandbox_require();
 	startup.set_function_metatable();