From d40b95f2e84ed781b81db705ac42a4022533098e Mon Sep 17 00:00:00 2001 From: Akkadius Date: Wed, 3 Jul 2019 19:22:06 -0500 Subject: [PATCH] ProcessLSStatus logging --- loginserver/world_server.cpp | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp index 576280a2d..b1abfa2a5 100644 --- a/loginserver/world_server.cpp +++ b/loginserver/world_server.cpp @@ -141,30 +141,40 @@ void WorldServer::ProcessNewLSInfo(uint16_t opcode, const EQ::Net::Packet &p) void WorldServer::ProcessLSStatus(uint16_t opcode, const EQ::Net::Packet &p) { - if (server.options.IsWorldTraceOn()) { - Log(Logs::General, - Logs::Netcode, - "Application packet received from server: 0x%.4X, (size %u)", - opcode, - p.Length()); - } + Log( + Logs::Detail, + Logs::Netcode, + "Application packet received from server: 0x%.4X, (size %u)", + opcode, + p.Length() + ); if (server.options.IsDumpInPacketsOn()) { DumpPacket(opcode, p); } if (p.Length() < sizeof(ServerLSStatus_Struct)) { - Log(Logs::General, + Log( + Logs::General, Logs::Error, - "Received application packet from server that had opcode ServerOP_LSStatus, but was too small. Discarded to avoid buffer overrun"); + "Received application packet from server that had opcode ServerOP_LSStatus, but was too small. Discarded to avoid buffer overrun" + ); + return; } - if (server.options.IsWorldTraceOn()) { - Log(Logs::General, Logs::Netcode, "World Server Status Received."); - } - ServerLSStatus_Struct *ls_status = (ServerLSStatus_Struct *) p.Data(); + + LogF( + Logs::Detail, + Logs::Login_Server, + "World Server Status Update Received | Server [{0}] Status [{1}] Players [{2}] Zones [{3}]", + this->GetLongName(), + ls_status->status, + ls_status->num_players, + ls_status->num_zones + ); + Handle_LSStatus(ls_status); }