From 698d6d4ed2d2ab92e73a80c9ee7683da21f34d9e Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 2 Sep 2019 03:30:03 -0500
Subject: [PATCH] Logs::ZoneServer to LogInfo

---
 zone/client.cpp      |  4 ++--
 zone/net.cpp         | 10 ++--------
 zone/object.cpp      |  2 +-
 zone/worldserver.cpp |  4 ++--
 zone/zone.cpp        |  7 +------
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/zone/client.cpp b/zone/client.cpp
index a9a66d3e6..0e5dfefdd 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -814,7 +814,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	char message[4096];
 	strn0cpy(message, orig_message, sizeof(message));
 
-	Log(Logs::Detail, Logs::ZoneServer, "Client::ChannelMessageReceived() Channel:%i message:'%s'", chan_num, message);
+	LogInfo("Client::ChannelMessageReceived() Channel:[{}] message:[{}]", chan_num, message);
 
 	if (targetname == nullptr) {
 		targetname = (!GetTarget()) ? "" : GetTarget()->GetName();
@@ -1636,7 +1636,7 @@ void Client::UpdateAdmin(bool iFromDB) {
 
 	if(m_pp.gm)
 	{
-		Log(Logs::Moderate, Logs::ZoneServer, "%s - %s is a GM", __FUNCTION__ , GetName());
+		LogInfo("[{}] - [{}] is a GM", __FUNCTION__ , GetName());
 // no need for this, having it set in pp you already start as gm
 // and it's also set in your spawn packet so other people see it too
 //		SendAppearancePacket(AT_GM, 1, false);
diff --git a/zone/net.cpp b/zone/net.cpp
index 4cb037c8f..f23e432e9 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -459,16 +459,10 @@ int main(int argc, char** argv) {
 		frame_prev = frame_now;
 
 		/**
-		 * Telnet server
+		 * Websocket server
 		 */
 		if (!websocker_server_opened && Config->ZonePort != 0) {
-			Log(
-				Logs::General,
-				Logs::ZoneServer,
-				"Websocket Server listener started (%s:%u).",
-				Config->TelnetIP.c_str(),
-				Config->ZonePort
-			);
+			LogInfo("Websocket Server listener started ([{}]:[{}])", Config->TelnetIP.c_str(), Config->ZonePort);
 			ws_server.reset(new EQ::Net::WebsocketServer(Config->TelnetIP, Config->ZonePort));
 			RegisterApiService(ws_server);
 			websocker_server_opened = true;
diff --git a/zone/object.cpp b/zone/object.cpp
index 1ca10ba33..4fbaef1c3 100644
--- a/zone/object.cpp
+++ b/zone/object.cpp
@@ -473,7 +473,7 @@ void Object::RandomSpawn(bool send_packet) {
 		} 
 	}
 
-	Log(Logs::Detail, Logs::ZoneServer, "Object::RandomSpawn(%s): %d (%.2f, %.2f, %.2f)", m_data.object_name, m_inst->GetID(), m_data.x, m_data.y, m_data.z);
+	LogInfo("Object::RandomSpawn([{}]): [{}] ([{}], [{}], [{}])", m_data.object_name, m_inst->GetID(), m_data.x, m_data.y, m_data.z);
 	
 	respawn_timer.Disable();
 
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 65793d0f5..97d02cc1f 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -191,7 +191,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (pack->size != sizeof(ServerConnectInfo))
 			break;
 		ServerConnectInfo* sci = (ServerConnectInfo*)pack->pBuffer;
-		Log(Logs::Detail, Logs::ZoneServer, "World assigned Port: %d for this zone.", sci->port);
+		LogInfo("World assigned Port: [{}] for this zone", sci->port);
 		ZoneConfig::SetZonePort(sci->port);
 		break;
 	}
@@ -794,7 +794,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 	}
 	case ServerOP_SyncWorldTime: {
 		if (zone != 0 && !zone->is_zone_time_localized) {
-			Log(Logs::Moderate, Logs::ZoneServer, "%s Received Message SyncWorldTime", __FUNCTION__);
+			LogInfo("[{}] Received Message SyncWorldTime", __FUNCTION__);
 
 			eqTimeOfDay* newtime = (eqTimeOfDay*)pack->pBuffer;
 			zone->zone_time.SetCurrentEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime);
diff --git a/zone/zone.cpp b/zone/zone.cpp
index ee891a056..459a055d4 100755
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -1462,12 +1462,7 @@ void Zone::StartShutdownTimer(uint32 set_time) {
 		LogInfo("Zone::StartShutdownTimer set to {}", set_time);
 	}
 
-	Log(Logs::Detail, Logs::ZoneServer,
-	    "Zone::StartShutdownTimer trigger - set_time: %u remaining_time: %u diff: %i",
-	    set_time,
-	    autoshutdown_timer.GetRemainingTime(),
-	    (set_time - autoshutdown_timer.GetRemainingTime())
-	);
+	LogInfo("Zone::StartShutdownTimer trigger - set_time: [{}] remaining_time: [{}] diff: [{}]", set_time, autoshutdown_timer.GetRemainingTime(), (set_time - autoshutdown_timer.GetRemainingTime()));
 }
 
 bool Zone::Depop(bool StartSpawnTimer) {