diff options
| author | Смердокрыл <smerdokryl@gmail.com> | 2023-06-09 21:36:03 +0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-04-07 12:05:20 +0200 |
| commit | 2fca5545553bcb368096d27bd1f72cda99e52520 (patch) | |
| tree | 66042597a5558f97e8832ceb39d5ca1b69da3d22 /src/common/Configuration/Config.h | |
| parent | 018e66bc914e3e39b01e15a51ad683a5e881d156 (diff) | |
Core/Config: Implement reading config overrides from subdirectory (#29068)
Co-authored-by: Shauren <shauren.trinity@gmail.com>
(cherry picked from commit 74a4dc46b49e1902f44a36b5b3155ad103d8f3da)
Diffstat (limited to 'src/common/Configuration/Config.h')
| -rw-r--r-- | src/common/Configuration/Config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h index 3e8dabe8ce3..0398506e9f9 100644 --- a/src/common/Configuration/Config.h +++ b/src/common/Configuration/Config.h @@ -20,6 +20,7 @@ #include "Define.h" #include <string> +#include <string_view> #include <vector> class TC_COMMON_API ConfigMgr @@ -33,6 +34,7 @@ public: /// Method used only for loading main configuration files (authserver.conf and worldserver.conf) bool LoadInitial(std::string file, std::vector<std::string> args, std::string& error); bool LoadAdditionalFile(std::string file, bool keepOnReload, std::string& error); + bool LoadAdditionalDir(std::string const& dir, bool keepOnReload, std::vector<std::string>& loadedFiles, std::vector<std::string>& errors); /// Overrides configuration with environment variables and returns overridden keys std::vector<std::string> OverrideWithEnvVariablesIfAny(); |