ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(Core/Config): rework configs load system (#2566)

Browse source
This commit is contained in:
Kargatum 2020-07-12 22:47:12 +07:00 • committed by GitHub
parent 2fb9985a99
commit 94e6ef17a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 175 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/server/authserver/Main.cpp
View file

@ -36,7 +36,7 @@
#endif
#ifndef _ACORE_REALM_CONFIG
# define _ACORE_REALM_CONFIG "authserver.conf"
#define _ACORE_REALM_CONFIG "authserver.conf"
#endif
bool StartDB();
@ -92,19 +92,10 @@ extern int main(int argc, char** argv)
++count;
}
std::string cfg_def_file=_ACORE_REALM_CONFIG;
cfg_def_file += ".dist";
sConfigMgr->SetConfigList(std::string(configFile));
if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) {
printf("ERROR: Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
if (!sConfigMgr->LoadAppConfigs("authserver"))
return 1;
}
if (!sConfigMgr->LoadMore(configFile))
{
printf("WARNING: Invalid or missing configuration file : %s\n", configFile);
printf("Verify that the file exists and has \'[authserver]\' written in the top of the file!\n");
}
sLog->outString("%s (authserver)", GitRevision::GetFullVersion());
sLog->outString("<Ctrl-C> to stop.\n");