yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Module): don't fallback to .dist for module configs (#22874)

Browse Source
This commit is contained in:
Tereneckla
2025-10-10 21:37:36 +00:00
committed by GitHub
parent c52d99bfc4
commit 9ce8bd0cc6
2 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/CMakeLists.txt
View File

@@ -342,6 +342,7 @@ foreach(ModuleName ${MODULE_LIST__})
foreach(configFileName ${MODULE_CONFIG_LIST}) foreach(configFileName ${MODULE_CONFIG_LIST})
CopyModuleConfig("${MODULE_CONFIG_PATH}/${configFileName}") CopyModuleConfig("${MODULE_CONFIG_PATH}/${configFileName}")
string(REGEX REPLACE "\.dist$" "" configFileName ${configFileName})
set(CONFIG_LIST ${CONFIG_LIST}${configFileName},) set(CONFIG_LIST ${CONFIG_LIST}${configFileName},)
message(STATUS " | * ${configFileName}") message(STATUS " | * ${configFileName}")
endforeach() endforeach()

49
src/common/Configuration/Config.cpp
View File

@@ -412,8 +412,14 @@ T ConfigMgr::GetValueDefault(std::string const& name, T const& def, bool showLog
LOG_FATAL("server.loading", "> Config:\n\nFATAL ERROR: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable\n\nYour server cannot start without this option!", LOG_FATAL("server.loading", "> Config:\n\nFATAL ERROR: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable\n\nYour server cannot start without this option!",
name, _filename, name, Acore::ToString(def), envVarName); name, _filename, name, Acore::ToString(def), envVarName);
else else
{
std::string configs = _filename;
if (!_moduleConfigFiles.empty())
configs += " or module config";
LOG_WARN("server.loading", "> Config: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable.", LOG_WARN("server.loading", "> Config: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable.",
name, _filename, name, Acore::ToString(def), envVarName); name, configs, name, def, envVarName);
}
} }
return def; return def;
} }
@@ -471,8 +477,14 @@ std::string ConfigMgr::GetValueDefault<std::string>(std::string const& name, std
LOG_FATAL("server.loading", "> Config:\n\nFATAL ERROR: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable.\n\nYour server cannot start without this option!", LOG_FATAL("server.loading", "> Config:\n\nFATAL ERROR: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable.\n\nYour server cannot start without this option!",
name, _filename, name, def, envVarName); name, _filename, name, def, envVarName);
else else
{
std::string configs = _filename;
if (!_moduleConfigFiles.empty())
configs += " or module config";
LOG_WARN("server.loading", "> Config: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable.", LOG_WARN("server.loading", "> Config: Missing property {} in config file {}, add \"{} = {}\" to this file or define '{}' as an environment variable.",
name, _filename, name, def, envVarName); name, configs, name, def, envVarName);
}
} }
return def; return def;
@@ -588,38 +600,13 @@ bool ConfigMgr::LoadModulesConfigs(bool isReload /*= false*/, bool isNeedPrintIn
// Start loading module configs // Start loading module configs
std::string const& moduleConfigPath = GetConfigPath() + "modules/"; std::string const& moduleConfigPath = GetConfigPath() + "modules/";
bool isExistDefaultConfig = true;
bool isExistDistConfig = true;
for (auto const& distFileName : _additonalFiles) for (auto const& fileName : _additonalFiles)
{ {
std::string defaultFileName = distFileName; bool isExistConfig = LoadAdditionalFile(moduleConfigPath + fileName, false, isReload);
if (!defaultFileName.empty()) if (isExistConfig)
{ _moduleConfigFiles.emplace_back(fileName);
defaultFileName.erase(defaultFileName.end() - 5, defaultFileName.end());
}
// Load .conf.dist config
isExistDistConfig = LoadAdditionalFile(moduleConfigPath + distFileName, false, isReload);
if (!isReload && !isExistDistConfig)
{
LOG_FATAL("server.loading", "> ConfigMgr::LoadModulesConfigs: Not found original config '{}'. Stop loading", distFileName);
ABORT();
}
// Load .conf config
isExistDefaultConfig = LoadAdditionalFile(moduleConfigPath + defaultFileName, true, isReload);
if (isExistDefaultConfig && isExistDistConfig)
{
_moduleConfigFiles.emplace_back(defaultFileName);
}
else if (!isExistDefaultConfig && isExistDistConfig)
{
_moduleConfigFiles.emplace_back(distFileName);
}
} }
if (isNeedPrintInfo) if (isNeedPrintInfo)