diff options
author | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
commit | f2b49140d8f9309bb3613effbef0739216ba7a9b (patch) | |
tree | 6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /util/startup.lua | |
parent | e081fd664251a2eb7ab68262c2b8a3cad4b381c7 (diff) | |
parent | ae48864f9d7368bf2030d391d68d6363278202ea (diff) | |
download | prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.tar.gz prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.zip |
Merge 0.11->trunk
Diffstat (limited to 'util/startup.lua')
-rw-r--r-- | util/startup.lua | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/util/startup.lua b/util/startup.lua index c101c290..7a1a95aa 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -7,6 +7,7 @@ local logger = require "util.logger"; local log = logger.init("startup"); local config = require "core.configmanager"; +local config_warnings; local dependencies = require "util.dependencies"; @@ -64,6 +65,8 @@ function startup.read_config() print("**************************"); print(""); os.exit(1); + elseif err and #err > 0 then + config_warnings = err; end prosody.config_loaded = true; end @@ -96,8 +99,13 @@ function startup.init_logging() end); end -function startup.log_dependency_warnings() +function startup.log_startup_warnings() dependencies.log_warnings(); + if config_warnings then + for _, warning in ipairs(config_warnings) do + log("warn", "Configuration warning: %s", warning); + end + end end function startup.sanity_check() @@ -518,7 +526,7 @@ function startup.prosodyctl() startup.read_version(); startup.switch_user(); startup.check_dependencies(); - startup.log_dependency_warnings(); + startup.log_startup_warnings(); startup.check_unwriteable(); startup.load_libraries(); startup.init_http_client(); @@ -543,7 +551,7 @@ function startup.prosody() startup.add_global_prosody_functions(); startup.read_version(); startup.log_greeting(); - startup.log_dependency_warnings(); + startup.log_startup_warnings(); startup.load_secondary_libraries(); startup.init_http_client(); startup.init_data_store(); |