diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-04-10 20:39:05 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-04-10 20:39:05 +0100 |
| commit | 5a7d12cdf01cc899eee000b564355cdf17c0d060 (patch) | |
| tree | 5395e00c3a8f7ecd865d90bbc1ab574448b2a60a | |
| parent | fcd7a24cd6a0dc55e24e8a07f4cd573f0dea3d7a (diff) | |
| download | prosody-5a7d12cdf01cc899eee000b564355cdf17c0d060.tar.gz prosody-5a7d12cdf01cc899eee000b564355cdf17c0d060.zip | |
util.startup: Initialize logging immediately after configuration is read (which is how it used to work)
| -rw-r--r-- | util/startup.lua | 3 |
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(); |