More logging cleanup [skip ci]

This commit is contained in:
Akkadius 2019-09-07 02:18:15 -05:00
parent 9e3f9f9749
commit 6222132625

View File

@ -700,12 +700,11 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
if (WorldConfig::get()->UpdateStats) if (WorldConfig::get()->UpdateStats)
client = client_list.FindCharacter(ztz->name); client = client_list.FindCharacter(ztz->name);
Log(Logs::Detail, Logs::WorldServer, "ZoneToZone request for %s current zone %d req zone %d\n", LogInfo("ZoneToZone request for [{}] current zone [{}] req zone [{}]", ztz->name, ztz->current_zone_id, ztz->requested_zone_id);
ztz->name, ztz->current_zone_id, ztz->requested_zone_id);
/* This is a request from the egress zone */ /* This is a request from the egress zone */
if (GetZoneID() == ztz->current_zone_id && GetInstanceID() == ztz->current_instance_id) { if (GetZoneID() == ztz->current_zone_id && GetInstanceID() == ztz->current_instance_id) {
LogInfo("Processing ZTZ for egress from zone for client [{}]\n", ztz->name); LogInfo("Processing ZTZ for egress from zone for client [{}]", ztz->name);
if (ztz->admin < 80 && ztz->ignorerestrictions < 2 && zoneserver_list.IsZoneLocked(ztz->requested_zone_id)) { if (ztz->admin < 80 && ztz->ignorerestrictions < 2 && zoneserver_list.IsZoneLocked(ztz->requested_zone_id)) {
ztz->response = 0; ztz->response = 0;
@ -723,20 +722,20 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
/* Zone was already running*/ /* Zone was already running*/
if (ingress_server) { if (ingress_server) {
LogInfo("Found a zone already booted for [{}]\n", ztz->name); LogInfo("Found a zone already booted for [{}]", ztz->name);
ztz->response = 1; ztz->response = 1;
} }
/* Boot the Zone*/ /* Boot the Zone*/
else { else {
int server_id; int server_id;
if ((server_id = zoneserver_list.TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))) { if ((server_id = zoneserver_list.TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))) {
LogInfo("Successfully booted a zone for [{}]\n", ztz->name); LogInfo("Successfully booted a zone for [{}]", ztz->name);
// bootup successful, ready to rock // bootup successful, ready to rock
ztz->response = 1; ztz->response = 1;
ingress_server = zoneserver_list.FindByID(server_id); ingress_server = zoneserver_list.FindByID(server_id);
} }
else { else {
LogInfo("failed to boot a zone for [{}]\n", ztz->name); LogError("failed to boot a zone for [{}]", ztz->name);
// bootup failed, send back error code 0 // bootup failed, send back error code 0
ztz->response = 0; ztz->response = 0;
} }
@ -751,7 +750,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
/* Response from Ingress server, route back to egress */ /* Response from Ingress server, route back to egress */
else { else {
LogInfo("Processing ZTZ for ingress to zone for client [{}]\n", ztz->name); LogInfo("Processing ZTZ for ingress to zone for client [{}]", ztz->name);
ZoneServer *egress_server = nullptr; ZoneServer *egress_server = nullptr;
if (ztz->current_instance_id > 0) { if (ztz->current_instance_id > 0) {
egress_server = zoneserver_list.FindByInstanceID(ztz->current_instance_id); egress_server = zoneserver_list.FindByInstanceID(ztz->current_instance_id);