diff --git a/src/LogInit.cxx b/src/LogInit.cxx index 3348ee2f0..0f2dab10d 100644 --- a/src/LogInit.cxx +++ b/src/LogInit.cxx @@ -22,7 +22,7 @@ #include "LogBackend.hxx" #include "Log.hxx" #include "config/Param.hxx" -#include "config/Global.hxx" +#include "config/Data.hxx" #include "config/Option.hxx" #include "fs/AllocatedPath.hxx" #include "fs/FileSystem.hxx" @@ -118,7 +118,7 @@ log_early_init(bool verbose) } void -log_init(bool verbose, bool use_stdout) +log_init(const ConfigData &config, bool verbose, bool use_stdout) { #ifdef ANDROID (void)verbose; @@ -126,14 +126,14 @@ log_init(bool verbose, bool use_stdout) #else if (verbose) SetLogThreshold(LogLevel::DEBUG); - else if (const auto ¶m = config_get_param(ConfigOption::LOG_LEVEL)) + else if (const auto ¶m = config.GetParam(ConfigOption::LOG_LEVEL)) SetLogThreshold(parse_log_level(param->value.c_str(), param->line)); if (use_stdout) { out_fd = STDOUT_FILENO; } else { - const auto *param = config_get_param(ConfigOption::LOG_FILE); + const auto *param = config.GetParam(ConfigOption::LOG_FILE); if (param == nullptr) { /* no configuration: default to syslog (if available) */ diff --git a/src/LogInit.hxx b/src/LogInit.hxx index 92c5f55f8..a09b4e139 100644 --- a/src/LogInit.hxx +++ b/src/LogInit.hxx @@ -20,6 +20,8 @@ #ifndef MPD_LOG_INIT_HXX #define MPD_LOG_INIT_HXX +struct ConfigData; + /** * Configure a logging destination for daemon startup, before the * configuration file is read. This allows the daemon to use the @@ -35,7 +37,7 @@ log_early_init(bool verbose); * Throws #std::runtime_error on error. */ void -log_init(bool verbose, bool use_stdout); +log_init(const ConfigData &config, bool verbose, bool use_stdout); void log_deinit(); diff --git a/src/Main.cxx b/src/Main.cxx index e0a20d553..4bce50b3d 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -509,7 +509,7 @@ try { TagLoadConfig(raw_config); - log_init(options.verbose, options.log_stderr); + log_init(raw_config, options.verbose, options.log_stderr); instance = new Instance();