aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-04-10 20:39:05 +0100
committerMatthew Wild <mwild1@gmail.com>2018-04-10 20:39:05 +0100
commit76a81554ff9c0babc714ebf4a0f4cd439e4033cf (patch)
tree5395e00c3a8f7ecd865d90bbc1ab574448b2a60a
parent4ff9afe599dd97bace235000685874e12d1949d7 (diff)
downloadprosody-76a81554ff9c0babc714ebf4a0f4cd439e4033cf.tar.gz
prosody-76a81554ff9c0babc714ebf4a0f4cd439e4033cf.zip
util.startup: Initialize logging immediately after configuration is read (which is how it used to work)
-rw-r--r--util/startup.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua
index 11500496..d1c2f00c 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -505,6 +505,7 @@ end
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 @@ function startup.prosodyctl()
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 @@ function startup.prosody()
-- 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();