5 files changed, 17 insertions, 21 deletions
diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index 0c6b189f9..44398d92d 100644
--- a/src/zenhttp/servers/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
@@ -47,18 +47,18 @@ static constinit uint32_t HashSession		= HashStringAsLowerDjb2("UE-Session"sv);
 static constinit uint32_t HashRequest		= HashStringAsLowerDjb2("UE-Request"sv);
 static constinit uint32_t HashRange			= HashStringAsLowerDjb2("Range"sv);
 
-inline spdlog::logger&
+inline LoggerRef
 InitLogger()
 {
-	spdlog::logger& Logger = logging::Get("asio");
+	LoggerRef Logger = logging::Get("asio");
 	// Logger.set_level(spdlog::level::trace);
 	return Logger;
 }
 
-inline spdlog::logger&
+inline LoggerRef
 Log()
 {
-	static spdlog::logger& g_Logger = InitLogger();
+	static LoggerRef g_Logger = InitLogger();
 	return g_Logger;
 }
 
@@ -1007,7 +1007,7 @@ HttpAsioServer::Run(bool IsInteractive)
 #if ZEN_PLATFORM_WINDOWS
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (asio HTTP). Press ESC or Q to quit");
+		ZEN_CONSOLE("Zen Server running (asio HTTP). Press ESC or Q to quit");
 	}
 
 	do
@@ -1027,7 +1027,7 @@ HttpAsioServer::Run(bool IsInteractive)
 #else
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (asio HTTP). Ctrl-C to quit");
+		ZEN_CONSOLE("Zen Server running (asio HTTP). Ctrl-C to quit");
 	}
 
 	do
diff --git a/src/zenhttp/servers/httpmulti.cpp b/src/zenhttp/servers/httpmulti.cpp
index 6b7060d5e..d8ebdc9c0 100644
--- a/src/zenhttp/servers/httpmulti.cpp
+++ b/src/zenhttp/servers/httpmulti.cpp
@@ -63,7 +63,7 @@ HttpMultiServer::Run(bool IsInteractiveSession)
 #if ZEN_PLATFORM_WINDOWS
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (multi server). Press ESC or Q to quit");
+		ZEN_CONSOLE("Zen Server running (multi server). Press ESC or Q to quit");
 	}
 
 	do
@@ -83,7 +83,7 @@ HttpMultiServer::Run(bool IsInteractiveSession)
 #else
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (null HTTP). Ctrl-C to quit");
+		ZEN_CONSOLE("Zen Server running (null HTTP). Ctrl-C to quit");
 	}
 
 	do
diff --git a/src/zenhttp/servers/httpnull.cpp b/src/zenhttp/servers/httpnull.cpp
index 658f51831..7d3e9079a 100644
--- a/src/zenhttp/servers/httpnull.cpp
+++ b/src/zenhttp/servers/httpnull.cpp
@@ -44,7 +44,7 @@ HttpNullServer::Run(bool IsInteractiveSession)
 #if ZEN_PLATFORM_WINDOWS
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (null HTTP). Press ESC or Q to quit");
+		ZEN_CONSOLE("Zen Server running (null HTTP). Press ESC or Q to quit");
 	}
 
 	do
@@ -64,7 +64,7 @@ HttpNullServer::Run(bool IsInteractiveSession)
 #else
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (null HTTP). Ctrl-C to quit");
+		ZEN_CONSOLE("Zen Server running (null HTTP). Ctrl-C to quit");
 	}
 
 	do
diff --git a/src/zenhttp/servers/httpplugin.cpp b/src/zenhttp/servers/httpplugin.cpp
index 3c727763b..4ae7cd87a 100644
--- a/src/zenhttp/servers/httpplugin.cpp
+++ b/src/zenhttp/servers/httpplugin.cpp
@@ -651,7 +651,7 @@ HttpPluginServerImpl::Run(bool IsInteractive)
 #	if ZEN_PLATFORM_WINDOWS
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (plugin HTTP). Press ESC or Q to quit");
+		ZEN_CONSOLE("Zen Server running (plugin HTTP). Press ESC or Q to quit");
 	}
 
 	do
@@ -671,7 +671,7 @@ HttpPluginServerImpl::Run(bool IsInteractive)
 #	else
 	if (TestMode == false)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (plugin HTTP). Ctrl-C to quit");
+		ZEN_CONSOLE("Zen Server running (plugin HTTP). Ctrl-C to quit");
 	}
 
 	do
diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index f1cd3e3fc..4eeab6662 100644
--- a/src/zenhttp/servers/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
@@ -23,10 +23,6 @@
 
 #	include <http.h>
 
-namespace spdlog {
-class logger;
-}
-
 namespace zen {
 
 /**
@@ -70,9 +66,9 @@ private:
 	void UnregisterService(const char* Endpoint, HttpService& Service);
 
 private:
-	spdlog::logger& m_Log;
-	spdlog::logger& m_RequestLog;
-	spdlog::logger& Log() { return m_Log; }
+	LoggerRef m_Log;
+	LoggerRef m_RequestLog;
+	LoggerRef Log() { return m_Log; }
 
 	bool m_IsOk					   = false;
 	bool m_IsHttpInitialized	   = false;
@@ -1239,7 +1235,7 @@ HttpSysServer::Run(bool IsInteractive)
 {
 	if (IsInteractive)
 	{
-		zen::logging::ConsoleLog().info("Zen Server running (http.sys). Press ESC or Q to quit");
+		ZEN_CONSOLE("Zen Server running (http.sys). Press ESC or Q to quit");
 	}
 
 	do
@@ -1525,7 +1521,7 @@ HttpSysTransaction::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesTran
 	{
 		if (m_HandlerRequest.has_value())
 		{
-			m_HttpServer.m_RequestLog.info("{} {}", ToString(m_HandlerRequest->RequestVerb()), m_HandlerRequest->RelativeUri());
+			ZEN_LOG_INFO(m_HttpServer.m_RequestLog, "{} {}", ToString(m_HandlerRequest->RequestVerb()), m_HandlerRequest->RelativeUri());
 		}
 	}