Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Config: Restore ability to load additional config files for custom scripts

Browse Source 
(cherry picked from commit c1e4cfd07e)
This commit is contained in:
Shauren
2020-08-29 22:01:21 +02:00
parent 2aaebc193c
commit 7cd98cd7d2
3 changed files with 66 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,41 +29,65 @@ namespace bpt = boost::property_tree;
namespace
{
std::string _filename;
std::vector<std::string> _additonalFiles;
std::vector<std::string> _args;
bpt::ptree _config;
std::mutex _configLock;
bool LoadFile(std::string const& file, bpt::ptree& fullTree, std::string& error)
{
try
{
bpt::ini_parser::read_ini(file, fullTree);
if (fullTree.empty())
{
error = "empty file (" + file + ")";
return false;
}
}
catch (bpt::ini_parser::ini_parser_error const& e)
{
if (e.line() == 0)
error = e.message() + " (" + e.filename() + ")";
else
error = e.message() + " (" + e.filename() + ":" + std::to_string(e.line()) + ")";
return false;
}
return true;
}
}
bool ConfigMgr::LoadInitial(std::string const& file, std::vector<std::string> args,
bool ConfigMgr::LoadInitial(std::string file, std::vector<std::string> args,
std::string& error)
{
std::lock_guard<std::mutex> lock(_configLock);
_filename = file;
_args = args;
_filename = std::move(file);
_args = std::move(args);
try
{
bpt::ptree fullTree;
bpt::ini_parser::read_ini(file, fullTree);
if (fullTree.empty())
{
error = "empty file (" + file + ")";
return false;
}
// Since we're using only one section per config file, we skip the section and have direct property access
_config = fullTree.begin()->second;
}
catch (bpt::ini_parser::ini_parser_error const& e)
{
if (e.line() == 0)
error = e.message() + " (" + e.filename() + ")";
else
error = e.message() + " (" + e.filename() + ":" + std::to_string(e.line()) + ")";
bpt::ptree fullTree;
if (!LoadFile(_filename, fullTree, error))
return false;
}
// Since we're using only one section per config file, we skip the section and have direct property access
_config = fullTree.begin()->second;
return true;
}
bool ConfigMgr::LoadAdditionalFile(std::string file, bool keepOnReload, std::string& error)
{
bpt::ptree fullTree;
if (!LoadFile(file, fullTree, error))
return false;
for (bpt::ptree::value_type const& child : fullTree.begin()->second)
_config.put_child(bpt::ptree::path_type(child.first, '/'), child.second);
if (keepOnReload)
_additonalFiles.emplace_back(std::move(file));
return true;
}
@@ -74,9 +98,17 @@ ConfigMgr* ConfigMgr::instance()
return &instance;
}
bool ConfigMgr::Reload(std::string& error)
bool ConfigMgr::Reload(std::vector<std::string>& errors)
{
return LoadInitial(_filename, std::move(_args), error);
std::string error;
if (!LoadInitial(_filename, std::move(_args), error))
errors.push_back(std::move(error));
for (std::string const& additionalFile : _additonalFiles)
if (!LoadAdditionalFile(additionalFile, false, error))
errors.push_back(std::move(error));
return errors.empty();
}
template<class T>