Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 15:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MasterServer not always closing database connection on exit

Browse Source
This commit is contained in:
Marcono1234 2022-01-25 00:35:26 +01:00
parent 1e01423a93
commit 910448b0e7
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dMasterServer/MasterServer.cpp
View File

@ -66,7 +66,7 @@ int main(int argc, char** argv) {
//Create all the objects we need to run our service: //Create all the objects we need to run our service:
Game::logger = SetupLogger(); Game::logger = SetupLogger();
if (!Game::logger) return 0; if (!Game::logger) return -1;
Game::logger->Log("MasterServer", "Starting Master server...\n"); Game::logger->Log("MasterServer", "Starting Master server...\n");
Game::logger->Log("MasterServer", "Version: %i.%i\n", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR); Game::logger->Log("MasterServer", "Version: %i.%i\n", PROJECT_VERSION_MAJOR, PROJECT_VERSION_MINOR);
@ -118,7 +118,7 @@ int main(int argc, char** argv) {
Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password); Database::Connect(mysql_host, mysql_database, mysql_username, mysql_password);
} catch (sql::SQLException& ex) { } catch (sql::SQLException& ex) {
Game::logger->Log("MasterServer", "Got an error while connecting to the database: %s\n", ex.what()); Game::logger->Log("MasterServer", "Got an error while connecting to the database: %s\n", ex.what());
return 0; return -1;
} }
//If the first command line argument is -a or --account then make the user //If the first command line argument is -a or --account then make the user
@ -166,6 +166,10 @@ int main(int argc, char** argv) {
delete statement; delete statement;
std::cout << "Account created successfully!\n"; std::cout << "Account created successfully!\n";
Database::Destroy();
delete Game::logger;
return 0; return 0;
} }
@ -266,7 +270,8 @@ int main(int argc, char** argv) {
//10m shutdown for universe kill command //10m shutdown for universe kill command
if (shouldShutdown) { if (shouldShutdown) {
if (framesSinceKillUniverseCommand >= 40000) { if (framesSinceKillUniverseCommand >= 40000) {
std::exit(0); //Break main loop and exit
break;
} }
else else
framesSinceKillUniverseCommand++; framesSinceKillUniverseCommand++;