From 8c6ef98b227ee898f03ced7645b189e16ad65a33 Mon Sep 17 00:00:00 2001 From: cooltrain7 Date: Mon, 13 Dec 2021 01:29:38 +0000 Subject: [PATCH 1/6] Replaced cout with correct logger->log call - Use of cout breaks the flow of the console --- dDatabase/Database.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dDatabase/Database.cpp b/dDatabase/Database.cpp index 23fed182..cdadbbaa 100644 --- a/dDatabase/Database.cpp +++ b/dDatabase/Database.cpp @@ -28,7 +28,7 @@ void Database::Connect(const string& host, const string& database, const string& void Database::Destroy() { if (!con) return; - cout << "Destroying MySQL connection!" << endl; + Game::logger->Log("Database", "Destroying MySQL connection!\n"); con->close(); delete con; } //Destroy From 932128a084aaa8e8bb7fc17e441d20aec579f8a1 Mon Sep 17 00:00:00 2001 From: cooltrain7 Date: Mon, 13 Dec 2021 01:31:39 +0000 Subject: [PATCH 2/6] Replaced printf with correct logger->log call - Use of printf breaks the flow of the console --- dMasterServer/MasterServer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp index 926168a3..6fbe34f7 100644 --- a/dMasterServer/MasterServer.cpp +++ b/dMasterServer/MasterServer.cpp @@ -646,7 +646,7 @@ void HandlePacket(Packet* packet) { } case MSG_MASTER_SHUTDOWN_UNIVERSE: { - Game::logger->Log("MasterServer","Received shutdown universe command, ""shutting down in 10 minutes.\n"); + Game::logger->Log("MasterServer","Received shutdown universe command, shutting down in 10 minutes.\n"); shouldShutdown = true; break; } @@ -677,7 +677,7 @@ void ShutdownSequence() { auto* objIdManager = ObjectIDManager::TryInstance(); if (objIdManager != nullptr) { objIdManager->SaveToDatabase(); - printf("Saved objidtracker...\n"); + Game::logger->Log("MasterServer", "Saved ObjectIDTracker to DB\n"); } auto t = std::chrono::high_resolution_clock::now(); @@ -687,7 +687,8 @@ void ShutdownSequence() { exit(0); } - printf("Attempting to shutdown instances, max 60 seconds...\n"); + Game::logger->Log("MasterServer", "Attempting to shutdown instances, max 60 seconds...\n"); + while (true) { auto done = true; From ed151e6d45d28814a6a8bf40e73b70e980283eda Mon Sep 17 00:00:00 2001 From: cooltrain7 Date: Mon, 13 Dec 2021 01:33:51 +0000 Subject: [PATCH 3/6] Added extra information to connection log - Added correct class name to log calls - Added extra zone and instance information in ambiguous log call --- dNet/dServer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dNet/dServer.cpp b/dNet/dServer.cpp index 2a9a612e..245b7683 100644 --- a/dNet/dServer.cpp +++ b/dNet/dServer.cpp @@ -104,13 +104,13 @@ Packet* dServer::ReceiveFromMaster() { if (packet->length < 1) { mMasterPeer->DeallocatePacket(packet); return nullptr; } if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) { - mLogger->Log("Server", "Lost our connection to master, shutting DOWN!\n"); + mLogger->Log("dServer", "Lost our connection to master, shutting DOWN!\n"); mMasterConnectionActive = false; //ConnectToMaster(); //We'll just shut down now } if (packet->data[0] == ID_CONNECTION_REQUEST_ACCEPTED) { - mLogger->Log("Server", "Established connection to master\n"); + mLogger->Log("dServer", "Established connection to master, zone (%i), instance (%i)\n",this->GetZoneID(), this->GetInstanceID()); mMasterConnectionActive = true; mMasterSystemAddress = packet->systemAddress; MasterPackets::SendServerInfo(this, packet); @@ -147,7 +147,7 @@ Packet* dServer::ReceiveFromMaster() { } default: - mLogger->Log("Server", "Unknown packet ID from master: %i\n", packet->data[3]); + mLogger->Log("dServer", "Unknown packet ID from master: %i\n", packet->data[3]); } } } From 9b1fbe6c2cb60bc621a2d54917d00d9a04c251fd Mon Sep 17 00:00:00 2001 From: cooltrain7 Date: Mon, 13 Dec 2021 01:37:09 +0000 Subject: [PATCH 4/6] Added extra log information and replaced incorrect print statements - Added extra Zone and Instance information to ambiguous log calls during loading. chat connection, chat connection loss, and shutdown - Fixed correct class names in some log lines - Replaced printf during world shutdown with correct log call with instance and zone info --- dWorldServer/WorldServer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp index 5d155f29..3e9a8961 100644 --- a/dWorldServer/WorldServer.cpp +++ b/dWorldServer/WorldServer.cpp @@ -416,7 +416,7 @@ int main(int argc, char** argv) { if (framesSinceMasterStatus >= 200) { - Game::logger->Log("WorldServer", "Finished loading world, ready up!\n"); + Game::logger->Log("WorldServer", "Finished loading world with zone (%i), ready up!\n", Game::server->GetZoneID()); MasterPackets::SendWorldReady(Game::server, Game::server->GetZoneID(), Game::server->GetInstanceID()); @@ -487,7 +487,7 @@ int main(int argc, char** argv) { if (Game::physicsWorld) Game::physicsWorld = nullptr; if (Game::zoneManager) delete Game::zoneManager; - Game::logger->Log("Test", "Quitting\n"); + Game::logger->Log("WorldServer", "Shutdown complete, zone (%i), instance (%i)\n", Game::server->GetZoneID(), instanceID); Metrics::Clear(); Database::Destroy(); @@ -512,11 +512,11 @@ dLogger * SetupLogger(int zoneID, int instanceID) { void HandlePacketChat(Packet* packet) { if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) { - Game::logger->Log("WorldServer", "Lost our connection to chat.\n"); + Game::logger->Log("WorldServer", "Lost our connection to chat, zone(%i), instance(%i)\n", Game::server->GetZoneID(), Game::server->GetInstanceID()); } if (packet->data[0] == ID_CONNECTION_REQUEST_ACCEPTED) { - Game::logger->Log("WorldServer", "Established connection to chat\n"); + Game::logger->Log("WorldServer", "Established connection to chat, zone(%i), instance (%i)\n",Game::server -> GetZoneID(), Game::server -> GetInstanceID()); Game::chatSysAddr = packet->systemAddress; } @@ -798,7 +798,7 @@ void HandlePacket(Packet* packet) { case MSG_MASTER_SHUTDOWN: { worldShutdownSequenceStarted = true; - Game::logger->Log("WorldServer", "Got shutdown request\n"); + Game::logger->Log("WorldServer", "Got shutdown request from master, zone (%i), instance (%i)\n", Game::server->GetZoneID(), Game::server->GetInstanceID()); break; } @@ -1095,11 +1095,11 @@ void HandlePacket(Packet* packet) { } } else { - Game::logger->Log("WorldMain", "Couldn't find character to log in with for user %s (%i)!\n", user->GetUsername().c_str(), user->GetAccountID()); + Game::logger->Log("WorldServer", "Couldn't find character to log in with for user %s (%i)!\n", user->GetUsername().c_str(), user->GetAccountID()); Game::server->Disconnect(packet->systemAddress, SERVER_DISCON_CHARACTER_NOT_FOUND); } } else { - Game::logger->Log("WorldMain", "Couldn't get user for level load complete!\n"); + Game::logger->Log("WorldServer", "Couldn't get user for level load complete!\n"); } break; } @@ -1205,7 +1205,7 @@ void WorldShutdownSequence() auto t = std::chrono::high_resolution_clock::now(); auto ticks = 0; - printf("Attempting to shutdown world, max 10 seconds...");; + Game::logger->Log("WorldServer", "Attempting to shutdown world, zone (%i), instance (%i), max 10 seconds...\n", Game::server->GetZoneID(), instanceID); while (true) { From 995042f130c9276275eb1901a5a72df10b73e6ac Mon Sep 17 00:00:00 2001 From: cooltrain7 Date: Mon, 13 Dec 2021 19:45:08 +0000 Subject: [PATCH 5/6] Added missing log newline character --- dGame/dGameMessages/GameMessages.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp index fad5d7de..4ad302e1 100644 --- a/dGame/dGameMessages/GameMessages.cpp +++ b/dGame/dGameMessages/GameMessages.cpp @@ -5673,7 +5673,7 @@ void GameMessages::HandleDoneArrangingWithItem(RakNet::BitStream* inStream, Enti return; } - Game::logger->Log("GameMessages", "Build area found: %llu", buildArea->GetObjectID()); + Game::logger->Log("GameMessages", "Build area found: %llu\n", buildArea->GetObjectID()); GameMessages::SendStartArrangingWithItem( character, From 6e6eee71b3bfc9b3fe8ed9cc70e8c743ee9f2097 Mon Sep 17 00:00:00 2001 From: cooltrain7 Date: Tue, 28 Dec 2021 19:27:46 +0000 Subject: [PATCH 6/6] Added more missing newline characters --- dChatServer/ChatPacketHandler.cpp | 2 +- dGame/dBehaviors/VerifyBehavior.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dChatServer/ChatPacketHandler.cpp b/dChatServer/ChatPacketHandler.cpp index 737bbba4..899fd355 100644 --- a/dChatServer/ChatPacketHandler.cpp +++ b/dChatServer/ChatPacketHandler.cpp @@ -354,7 +354,7 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) if (team->memberIDs.size() > 3) { // no more teams greater than 4 - Game::logger->Log("ChatPacketHandler", "Someone tried to invite a 5th player to a team"); + Game::logger->Log("ChatPacketHandler", "Someone tried to invite a 5th player to a team\n"); return; } diff --git a/dGame/dBehaviors/VerifyBehavior.cpp b/dGame/dBehaviors/VerifyBehavior.cpp index 71f75a18..f4edfece 100644 --- a/dGame/dBehaviors/VerifyBehavior.cpp +++ b/dGame/dBehaviors/VerifyBehavior.cpp @@ -23,7 +23,7 @@ void VerifyBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitS if (self == nullptr) { - Game::logger->Log("VerifyBehavior", "Invalid self for (%llu)", context->originator); + Game::logger->Log("VerifyBehavior", "Invalid self for (%llu)\n", context->originator); return; }