2 files changed, 34 insertions, 18 deletions

diff --git a/src/zenhttp/transports/asiotransport.cpp b/src/zenhttp/transports/asiotransport.cpp
index 23ac1bc8b..d5413b9af 100644
--- a/src/zenhttp/transports/asiotransport.cpp
+++ b/src/zenhttp/transports/asiotransport.cpp
@@ -47,10 +47,10 @@ private:
 	uint16_t m_BasePort	   = 8558;
 	int		 m_ThreadCount = 0;
 
-	asio::io_service					   m_IoService;
-	asio::io_service::work				   m_Work{m_IoService};
-	std::unique_ptr<AsioTransportAcceptor> m_Acceptor;
-	std::vector<std::thread>			   m_ThreadPool;
+	asio::io_context										   m_IoService;
+	asio::executor_work_guard<asio::io_context::executor_type> m_Work{m_IoService.get_executor()};
+	std::unique_ptr<AsioTransportAcceptor>					   m_Acceptor;
+	std::vector<std::thread>								   m_ThreadPool;
 };
 
 struct AsioTransportConnection : public TransportConnection, std::enable_shared_from_this<AsioTransportConnection>
@@ -85,7 +85,7 @@ private:
 
 struct AsioTransportAcceptor
 {
-	AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_service& IoService, uint16_t BasePort);
+	AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_context& IoService, uint16_t BasePort);
 	~AsioTransportAcceptor();
 
 	void Start();
@@ -95,7 +95,7 @@ struct AsioTransportAcceptor
 
 private:
 	TransportServer*		m_ServerInterface = nullptr;
-	asio::io_service&		m_IoService;
+	asio::io_context&		m_IoService;
 	asio::ip::tcp::acceptor m_Acceptor;
 	std::atomic<bool>		m_IsStopped{false};
 
@@ -104,7 +104,7 @@ private:
 
 //////////////////////////////////////////////////////////////////////////
 
-AsioTransportAcceptor::AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_service& IoService, uint16_t BasePort)
+AsioTransportAcceptor::AsioTransportAcceptor(TransportServer* ServerInterface, asio::io_context& IoService, uint16_t BasePort)
 : m_ServerInterface(ServerInterface)
 , m_IoService(IoService)
 , m_Acceptor(m_IoService, asio::ip::tcp::v6())
diff --git a/src/zenhttp/transports/dlltransport.cpp b/src/zenhttp/transports/dlltransport.cpp
index 9135d5425..489324aba 100644
--- a/src/zenhttp/transports/dlltransport.cpp
+++ b/src/zenhttp/transports/dlltransport.cpp
@@ -72,20 +72,36 @@ DllTransportLogger::DllTransportLogger(std::string_view PluginName) : m_PluginNa
 void
 DllTransportLogger::LogMessage(LogLevel PluginLogLevel, const char* Message)
 {
-	logging::level::LogLevel Level;
-	// clang-format off
 	switch (PluginLogLevel)
 	{
-		case LogLevel::Trace:    Level = logging::level::Trace;    break;
-		case LogLevel::Debug:    Level = logging::level::Debug;    break;
-		case LogLevel::Info:     Level = logging::level::Info;     break;
-		case LogLevel::Warn:     Level = logging::level::Warn;     break;
-		case LogLevel::Err:      Level = logging::level::Err;      break;
-		case LogLevel::Critical: Level = logging::level::Critical; break;
-		default:                 Level = logging::level::Off;      break;
+		case LogLevel::Trace:
+			ZEN_TRACE("[{}] {}", m_PluginName, Message);
+			return;
+
+		case LogLevel::Debug:
+			ZEN_DEBUG("[{}] {}", m_PluginName, Message);
+			return;
+
+		case LogLevel::Info:
+			ZEN_INFO("[{}] {}", m_PluginName, Message);
+			return;
+
+		case LogLevel::Warn:
+			ZEN_WARN("[{}] {}", m_PluginName, Message);
+			return;
+
+		case LogLevel::Err:
+			ZEN_ERROR("[{}] {}", m_PluginName, Message);
+			return;
+
+		case LogLevel::Critical:
+			ZEN_CRITICAL("[{}] {}", m_PluginName, Message);
+			return;
+
+		default:
+			ZEN_UNUSED(Message);
+			break;
 	}
-	// clang-format on
-	ZEN_LOG(Log(), Level, "[{}] {}", m_PluginName, Message)
 }
 
 uint32_t