Merged latest from main

1 files changed, 19 insertions, 3 deletions

diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp
index 997491613..26bba5484 100644
--- a/zenhttp/httpsys.cpp
+++ b/zenhttp/httpsys.cpp
@@ -417,7 +417,7 @@ HttpMessageResponseRequest::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfB
 
 	if (IoResult != NO_ERROR)
 	{
-		ZEN_WARN("response aborted due to error: '{}'", GetErrorAsString(IoResult));
+		ZEN_WARN("response aborted due to error: '{}'", GetSystemErrorAsString(IoResult));
 
 		// if one transmit failed there's really no need to go on
 		return nullptr;
@@ -553,7 +553,10 @@ HttpMessageResponseRequest::IssueRequest(std::error_code& ErrorCode)
 
 		CancelThreadpoolIo(Iocp);
 
-		ZEN_ERROR("failed to send HTTP response (error: '{}'), request URL: '{}'", GetErrorAsString(SendResult), HttpReq->pRawUrl);
+		ZEN_ERROR("failed to send HTTP response (error: '{}'), request URL: '{}', request id: {}",
+				  GetSystemErrorAsString(SendResult),
+				  HttpReq->pRawUrl,
+				  HttpReq->RequestId);
 
 		ErrorCode = MakeErrorCode(SendResult);
 	}
@@ -572,7 +575,10 @@ HttpMessageResponseRequest::IssueRequest(std::error_code& ErrorCode)
 					\/     \/                 \/
 */
 
-HttpSysServer::HttpSysServer(unsigned int ThreadCount) : m_ThreadPool(ThreadCount)
+HttpSysServer::HttpSysServer(unsigned int ThreadCount)
+: m_Log(logging::Get("http"))
+, m_RequestLog(logging::Get("http_requests"))
+, m_ThreadPool(ThreadCount)
 {
 	ULONG Result = HttpInitialize(HTTPAPI_VERSION_2, HTTP_INITIALIZE_SERVER, nullptr);
 
@@ -668,6 +674,8 @@ HttpSysServer::Initialize(const wchar_t* UrlPath)
 	else
 	{
 		m_IsOk = true;
+
+		ZEN_INFO("Started http.sys server at '{}'", WideToUtf8(UrlPath));
 	}
 }
 
@@ -947,6 +955,14 @@ HttpSysTransaction::HandleCompletion(ULONG IoResult, ULONG_PTR NumberOfBytesTran
 		return Status::kRequestPending;
 	}
 
+	if (m_HttpServer.m_IsRequestLoggingEnabled)
+	{
+		if (m_HandlerRequest.has_value())
+		{
+			m_HttpServer.m_RequestLog.info("{} {}", ToString(m_HandlerRequest->RequestVerb()), m_HandlerRequest->RelativeUri());
+		}
+	}
+
 	// Transaction done, caller should clean up (delete) this instance
 	return Status::kDone;
 }