Continue to run server even without custom .conf

You should be able to run both authserver and worldserver with default
configurations

Also changed *DatabaseInfo to fit information defined in our bash installer
and create sql
This commit is contained in:
Yehonal
2017-09-26 12:52:16 +02:00
parent 30e6abf6ab
commit c85b1b591e
4 changed files with 12 additions and 14 deletions

View File

@@ -96,15 +96,14 @@ extern int main(int argc, char** argv)
cfg_def_file += ".dist";
if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) {
printf("Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
printf("ERROR: Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
return 1;
}
if (!sConfigMgr->LoadMore(configFile))
{
printf("Invalid or missing configuration file : %s\n", 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");
return 1;
}
sLog->outString("%s (authserver)", _FULLVERSION);

View File

@@ -244,9 +244,9 @@ WrongPass.BanType = 0
# section my.ini)
# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
# Unix/Linux)
# Default: "127.0.0.1;3306;root;root;auth"
# Default: "127.0.0.1;3306;acore;acore;auth"
LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
LoginDatabaseInfo = "127.0.0.1;3306;acore;acore;acore_auth"
#
# LoginDatabase.WorkerThreads

View File

@@ -117,15 +117,14 @@ extern int main(int argc, char** argv)
cfg_def_file += ".dist";
if (!sConfigMgr->LoadInitial(cfg_def_file.c_str())) {
printf("Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
printf("ERROR: Invalid or missing default configuration file : %s\n", cfg_def_file.c_str());
return 1;
}
if (!sConfigMgr->LoadMore(cfg_file))
{
printf("Invalid or missing configuration file : %s\n", cfg_file);
printf("WARNING: Invalid or missing configuration file : %s\n", cfg_file);
printf("Verify that the file exists and has \'[worldserver]' written in the top of the file!\n");
return 1;
}
sLog->outString("Using configuration file %s.", cfg_file);

View File

@@ -83,13 +83,13 @@ LogsDir = ""
# section my.ini)
# ".;/path/to/unix_socket;username;password;database" - (use Unix sockets on
# Unix/Linux)
# Default: "127.0.0.1;3306;root;root;auth" - (LoginDatabaseInfo)
# "127.0.0.1;3306;root;root;world" - (WorldDatabaseInfo)
# "127.0.0.1;3306;root;root;characters" - (CharacterDatabaseInfo)
# Default: "127.0.0.1;3306;acore;acore;auth" - (LoginDatabaseInfo)
# "127.0.0.1;3306;acore;acore;world" - (WorldDatabaseInfo)
# "127.0.0.1;3306;acore;acore;characters" - (CharacterDatabaseInfo)
LoginDatabaseInfo = "127.0.0.1;3306;root;root;auth"
WorldDatabaseInfo = "127.0.0.1;3306;root;root;world"
CharacterDatabaseInfo = "127.0.0.1;3306;root;root;characters"
LoginDatabaseInfo = "127.0.0.1;3306;acore;acore;acore_auth"
WorldDatabaseInfo = "127.0.0.1;3306;acore;acore;acore_world"
CharacterDatabaseInfo = "127.0.0.1;3306;acore;acore;acore_characters"
#
# LoginDatabase.WorkerThreads