Merge branch 'main' into cbpackage-update

1 files changed, 11 insertions, 11 deletions

diff --git a/zenserver/upstream/zen.cpp b/zenserver/upstream/zen.cpp
index 7cdaa0036..eef92bab4 100644
--- a/zenserver/upstream/zen.cpp
+++ b/zenserver/upstream/zen.cpp
@@ -137,7 +137,7 @@ Mesh::EnqueueTick()
 		{
 			if (m_State != kExiting)
 			{
-				spdlog::warn("Mesh timer error: {}", Ec.message());
+				ZEN_WARN("Mesh timer error: {}", Ec.message());
 			}
 		}
 	});
@@ -198,12 +198,12 @@ Mesh::BroadcastPacket(CbObjectWriter& Obj)
 
 		if (ErrorCode)
 		{
-			spdlog::warn("packet broadcast failed: {}", ErrorCode.message());
+			ZEN_WARN("packet broadcast failed: {}", ErrorCode.message());
 		}
 	}
 	else
 	{
-		spdlog::warn("failed to open broadcast socket: {}", ErrorCode.message());
+		ZEN_WARN("failed to open broadcast socket: {}", ErrorCode.message());
 	}
 }
 
@@ -260,7 +260,7 @@ Mesh::IssueReceive()
 										const uint16_t Port = (++It)->AsUInt16(m_SenderEndpoint.port());
 										const uint32_t Lsn	= (++It)->AsUInt32();
 
-										spdlog::info("received hey from {} ({})", SenderIp, SessionId);
+										ZEN_INFO("received hey from {} ({})", SenderIp, SessionId);
 
 										RwLock::ExclusiveLockScope _(m_SessionsLock);
 
@@ -279,7 +279,7 @@ Mesh::IssueReceive()
 								{
 									Oid SessionId = Field.AsObjectId();
 
-									spdlog::info("received bye from {} ({})", SenderIp, SessionId);
+									ZEN_INFO("received bye from {} ({})", SenderIp, SessionId);
 
 									// We could verify that it's sent from a known IP before erasing the
 									// session, if we want to be paranoid
@@ -295,13 +295,13 @@ Mesh::IssueReceive()
 							}
 							else
 							{
-								spdlog::warn("received malformed message from {}", SenderIp);
+								ZEN_WARN("received malformed message from {}", SenderIp);
 							}
 						}
 						break;
 
 					default:
-						spdlog::warn("received malformed data from {}", SenderIp);
+						ZEN_WARN("received malformed data from {}", SenderIp);
 						break;
 				}
 			}
@@ -392,7 +392,7 @@ ZenStructuredCacheSession::GetCacheRecord(std::string_view BucketId, const IoHas
 	Session.SetHeader(cpr::Header{{"Accept", Type == ZenContentType::kCbObject ? "application/x-ue-cb" : "application/octet-stream"}});
 
 	cpr::Response Response = Session.Get();
-	m_Log.debug("GET {}", Response);
+	ZEN_DEBUG("GET {}", Response);
 
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
@@ -412,7 +412,7 @@ ZenStructuredCacheSession::GetCachePayload(std::string_view BucketId, const IoHa
 	Session.SetHeader(cpr::Header{{"Accept", "application/x-ue-comp"}});
 
 	cpr::Response Response = Session.Get();
-	m_Log.debug("GET {}", Response);
+	ZEN_DEBUG("GET {}", Response);
 
 	const bool	   Success = Response.status_code == 200;
 	const IoBuffer Buffer  = Success ? IoBufferBuilder::MakeCloneFromMemory(Response.text.data(), Response.text.size()) : IoBuffer();
@@ -434,7 +434,7 @@ ZenStructuredCacheSession::PutCacheRecord(std::string_view BucketId, const IoHas
 	Session.SetBody(cpr::Body{static_cast<const char*>(Value.Data()), Value.Size()});
 
 	cpr::Response Response = Session.Put();
-	m_Log.debug("PUT {}", Response);
+	ZEN_DEBUG("PUT {}", Response);
 
 	return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }
@@ -452,7 +452,7 @@ ZenStructuredCacheSession::PutCachePayload(std::string_view BucketId, const IoHa
 	Session.SetBody(cpr::Body{static_cast<const char*>(Payload.Data()), Payload.Size()});
 
 	cpr::Response Response = Session.Put();
-	m_Log.debug("PUT {}", Response);
+	ZEN_DEBUG("PUT {}", Response);
 
 	return {.Bytes = Response.uploaded_bytes, .ElapsedSeconds = Response.elapsed, .Success = Response.status_code == 200};
 }