diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2017-09-26 12:52:16 +0200 |
|---|---|---|
| committer | Yehonal <yehonal.azeroth@gmail.com> | 2017-09-26 12:52:16 +0200 |
| commit | c85b1b591e7a3fde24c1ed7e4655adc54c844bfb (patch) | |
| tree | 40ae5ba52a604ae38f665326f06a50b0157c511f | |
| parent | 30e6abf6ab30e1ee980ab3f21c176e504501d0c9 (diff) | |
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
| -rw-r--r-- | src/authserver/Main.cpp | 5 | ||||
| -rw-r--r-- | src/authserver/authserver.conf.dist | 4 | ||||
| -rw-r--r-- | src/worldserver/Main.cpp | 5 | ||||
| -rw-r--r-- | src/worldserver/worldserver.conf.dist | 12 |
4 files changed, 12 insertions, 14 deletions
diff --git a/src/authserver/Main.cpp b/src/authserver/Main.cpp index 8594f301e1..57ed11e458 100644 --- a/src/authserver/Main.cpp +++ b/src/authserver/Main.cpp @@ -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); diff --git a/src/authserver/authserver.conf.dist b/src/authserver/authserver.conf.dist index d0509d6a20..2ab525b97d 100644 --- a/src/authserver/authserver.conf.dist +++ b/src/authserver/authserver.conf.dist @@ -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 diff --git a/src/worldserver/Main.cpp b/src/worldserver/Main.cpp index 4271366e61..5110a2ce12 100644 --- a/src/worldserver/Main.cpp +++ b/src/worldserver/Main.cpp @@ -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); diff --git a/src/worldserver/worldserver.conf.dist b/src/worldserver/worldserver.conf.dist index 375643f803..5ad7a5bc3b 100644 --- a/src/worldserver/worldserver.conf.dist +++ b/src/worldserver/worldserver.conf.dist @@ -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 |