Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-04-27 17:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sped up server shutdown

Browse Source
This commit is contained in:
EmosewaMC 2022-04-09 14:17:31 -07:00
parent 5ef1848474
commit fd13770e87
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dMasterServer/MasterServer.cpp
View File

@ -751,6 +751,14 @@ void ShutdownSequence() {
Game::logger->Log("MasterServer", "Attempting to shutdown instances, max 60 seconds...\n"); Game::logger->Log("MasterServer", "Attempting to shutdown instances, max 60 seconds...\n");
while (true) { while (true) {
auto packet = Game::server->Receive();
if (packet) {
HandlePacket(packet);
Game::server->DeallocatePacket(packet);
packet = nullptr;
}
auto done = true; auto done = true;
for (auto* instance : Game::im->GetInstances()) { for (auto* instance : Game::im->GetInstances()) {
@ -764,6 +772,7 @@ void ShutdownSequence() {
} }
if (done) { if (done) {
Game::logger->Log("MasterServer", "Finished shutting down naturally!\n");
break; break;
} }
@ -773,6 +782,7 @@ void ShutdownSequence() {
ticks++; ticks++;
if (ticks == 600 * 6) { if (ticks == 600 * 6) {
Game::logger->Log("MasterServer", "Finished shutting down by timeout!\n");
break; break;
} }
} }

4
dWorldServer/WorldServer.cpp
View File

@ -522,10 +522,6 @@ int main(int argc, char** argv) {
CBITSTREAM; CBITSTREAM;
PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SHUTDOWN_RESPONSE); PacketUtils::WriteHeader(bitStream, MASTER, MSG_MASTER_SHUTDOWN_RESPONSE);
Game::server->SendToMaster(&bitStream); Game::server->SendToMaster(&bitStream);
}
if (framesSinceShutdownSequence == 300)
{
break; break;
} }
} }