diff options
| author | UltraNix <80540499+UltraNix@users.noreply.github.com> | 2021-06-04 23:57:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 23:57:10 +0200 |
| commit | c568bdcc42efce7de5ca543cc38f9c6f01914d01 (patch) | |
| tree | b2bb91f1c0d7451ed7cf495dfbf1c6afcd26639a /src/common/Configuration/Config.cpp | |
| parent | 196f74fdad977d534b222a5bf6ba9f68c59ec609 (diff) | |
feat(Modules): load modules configs before Log initialization (#6104)
in order to properly load modules appenders and loggers
Diffstat (limited to 'src/common/Configuration/Config.cpp')
| -rw-r--r-- | src/common/Configuration/Config.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp index 6bfc88e259..d24e082190 100644 --- a/src/common/Configuration/Config.cpp +++ b/src/common/Configuration/Config.cpp @@ -347,7 +347,6 @@ bool ConfigMgr::LoadModulesConfigs() return true; // Start loading module configs - std::vector<std::string /*config variant*/> moduleConfigFiles; std::string const& moduleConfigPath = GetConfigPath() + "modules/"; bool isExistDefaultConfig = true; bool isExistDistConfig = true; @@ -368,25 +367,25 @@ bool ConfigMgr::LoadModulesConfigs() isExistDefaultConfig = false; if (isExistDefaultConfig && isExistDistConfig) - moduleConfigFiles.emplace_back(defaultFileName); + _moduleConfigFiles.emplace_back(defaultFileName); else if (!isExistDefaultConfig && isExistDistConfig) - moduleConfigFiles.emplace_back(distFileName); + _moduleConfigFiles.emplace_back(distFileName); } // If module configs not exist - no load - if (moduleConfigFiles.empty()) - return false; + return !_moduleConfigFiles.empty(); +} +void ConfigMgr::PrintLoadedModulesConfigs() +{ // Print modules configurations LOG_INFO("server", " "); LOG_INFO("server", "Using modules configuration:"); - for (auto const& itr : moduleConfigFiles) + for (auto const& itr : _moduleConfigFiles) LOG_INFO("server", "> %s", itr.c_str()); LOG_INFO("server", " "); - - return true; } /* |
