summaryrefslogtreecommitdiff
path: root/src/common/Configuration/Config.cpp
diff options
context:
space:
mode:
authorKargatum <dowlandtop@yandex.com>2021-06-25 00:50:18 +0700
committerGitHub <noreply@github.com>2021-06-24 19:50:18 +0200
commit3c24b511f2fb2b23618e9cd0b24d28cb5afa34ad (patch)
tree78baa1669874acf8b7adf1c1994e383e814a3146 /src/common/Configuration/Config.cpp
parent33c271cc7c191f72406873d81abd954525d093c0 (diff)
refactor(Core/Misc): add braces and impove codestyle (#6402)
Diffstat (limited to 'src/common/Configuration/Config.cpp')
-rw-r--r--src/common/Configuration/Config.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/src/common/Configuration/Config.cpp b/src/common/Configuration/Config.cpp
index f82e5fc132..16082e7022 100644
--- a/src/common/Configuration/Config.cpp
+++ b/src/common/Configuration/Config.cpp
@@ -153,7 +153,9 @@ namespace
// No lines read
if (!count)
+ {
throw ConfigException(Acore::StringFormat("Config::LoadFile: Empty file '%s'", file.c_str()));
+ }
// Add correct keys if file load without errors
for (auto const& [entry, key] : fileConfigs)
@@ -200,7 +202,9 @@ ConfigMgr* ConfigMgr::instance()
bool ConfigMgr::Reload()
{
if (!LoadAppConfigs())
+ {
return false;
+ }
return LoadModulesConfigs();
}
@@ -287,7 +291,9 @@ std::vector<std::string> ConfigMgr::GetKeysByString(std::string const& name)
for (auto const& [optionName, key] : _configOptions)
if (!optionName.compare(0, name.length(), name))
+ {
keys.emplace_back(optionName);
+ }
return keys;
}
@@ -324,7 +330,9 @@ void ConfigMgr::Configure(std::string const& initFileName, std::vector<std::stri
{
Tokenizer configFileList(modulesConfigList, ',');
for (auto const& itr : configFileList)
+ {
_additonalFiles.emplace_back(std::string(itr));
+ }
}
}
@@ -332,11 +340,15 @@ bool ConfigMgr::LoadAppConfigs()
{
// #1 - Load init config file .conf.dist
if (!LoadInitial(_filename + ".dist"))
+ {
return false;
+ }
// #2 - Load .conf file
if (!LoadAdditionalFile(_filename))
+ {
return false;
+ }
return true;
}
@@ -344,7 +356,9 @@ bool ConfigMgr::LoadAppConfigs()
bool ConfigMgr::LoadModulesConfigs()
{
if (_additonalFiles.empty())
+ {
return true;
+ }
// Start loading module configs
std::string const& moduleConfigPath = GetConfigPath() + "modules/";
@@ -356,20 +370,30 @@ bool ConfigMgr::LoadModulesConfigs()
std::string defaultFileName = distFileName;
if (!defaultFileName.empty())
+ {
defaultFileName.erase(defaultFileName.end() - 5, defaultFileName.end());
+ }
// Load .conf.dist config
if (!LoadAdditionalFile(moduleConfigPath + distFileName))
+ {
isExistDistConfig = false;
+ }
// Load .conf config
if (!LoadAdditionalFile(moduleConfigPath + defaultFileName))
+ {
isExistDefaultConfig = false;
+ }
if (isExistDefaultConfig && isExistDistConfig)
+ {
_moduleConfigFiles.emplace_back(defaultFileName);
+ }
else if (!isExistDefaultConfig && isExistDistConfig)
+ {
_moduleConfigFiles.emplace_back(distFileName);
+ }
}
// If module configs not exist - no load
@@ -383,7 +407,9 @@ void ConfigMgr::PrintLoadedModulesConfigs()
LOG_INFO("server.loading", "Using modules configuration:");
for (auto const& itr : _moduleConfigFiles)
+ {
LOG_INFO("server.loading", "> %s", itr.c_str());
+ }
LOG_INFO("server.loading", " ");
}