From 8375739a81638f2314b5f6b40d4e5f96d6299538 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Sat, 12 Apr 2025 14:42:35 +0100
Subject: [PATCH] Cleaned up how request logging is handled

---
 .../Servers/HttpServer.cs                     | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs b/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs
index c15004f8..b8ac4823 100644
--- a/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs
+++ b/Libraries/SPTarkov.Server.Core/Servers/HttpServer.cs
@@ -99,29 +99,9 @@ public class HttpServer(
 
         if (_httpConfig.LogRequests)
         {
-            var isLocalRequest = IsLocalRequest(clientIp);
-            if (isLocalRequest.HasValue)
-            {
-                if (isLocalRequest.Value)
-                {
-                    _logger.Info(_localisationService.GetText("client_request", context.Request.Path.Value));
-                }
-                else
-                {
-                    _logger.Info(
-                        _localisationService.GetText(
-                            "client_request_ip", new
-                            {
-                                ip = clientIp,
-                                url = context.Request.Path.Value
-                            }
-                        )
-                    );
-                }
-            }
+            LogRequest(context, clientIp, IsLocalRequest(clientIp));
         }
 
-
         try
         {
             _httpListeners.SingleOrDefault(l => l.CanHandle(sessionId, context.Request))?.Handle(sessionId, context.Request, context.Response);
@@ -135,7 +115,33 @@ public class HttpServer(
         // This http request would be passed through the SPT Router and handled by an ICallback
     }
 
-    protected static string? GetClientIp(HttpContext context, StringValues? realIp)
+    /// <summary>
+    /// Log request - handle differently if request is local
+    /// </summary>
+    /// <param name="context">HttpContext of request</param>
+    /// <param name="clientIp">Ip of requester</param>
+    /// <param name="isLocalRequest">Is this local request</param>
+    protected void LogRequest(HttpContext context, string clientIp, bool isLocalRequest)
+    {
+        if (isLocalRequest)
+        {
+            _logger.Info(_localisationService.GetText("client_request", context.Request.Path.Value));
+        }
+        else
+        {
+            _logger.Info(
+                _localisationService.GetText(
+                    "client_request_ip", new
+                    {
+                        ip = clientIp,
+                        url = context.Request.Path.Value
+                    }
+                )
+            );
+        }
+    }
+
+    protected static string GetClientIp(HttpContext context, StringValues? realIp)
     {
         if (realIp.HasValue)
         {
@@ -153,11 +159,11 @@ public class HttpServer(
     /// </summary>
     /// <param name="remoteAddress"> Address to check </param>
     /// <returns> True if its local </returns>
-    protected bool? IsLocalRequest(string? remoteAddress)
+    protected bool IsLocalRequest(string? remoteAddress)
     {
         if (remoteAddress == null)
         {
-            return null;
+            return false;
         }
 
         return remoteAddress.StartsWith("127.0.0") ||