prosody
2fdeb979cc7c
util/startup.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

util/startup.lua @ 8748:2fdeb979cc7c

util.startup: Initialize logging immediately after configuration is read (which is how it used to work)
author Matthew Wild <mwild1@gmail.com>
date Tue, 10 Apr 2018 20:39:05 +0100
parent 8734:36d49a9c5e88
child 8755:857d8f38a010
line wrap: on
line diff
--- 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();