From bbeddcb814a7de2f55b780cd02ce3df0fbb226a4 Mon Sep 17 00:00:00 2001
From: CWX <cwxdev@outlook.com>
Date: Tue, 22 Apr 2025 16:00:08 +0100
Subject: [PATCH] Fix logging in SingleFile setup

---
 SPTarkov.Server/Program.cs                   | 12 +++++-------
 SPTarkov.Server/appsettings.Development.json |  8 +++++++-
 SPTarkov.Server/appsettings.json             | 12 +++++++++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/SPTarkov.Server/Program.cs b/SPTarkov.Server/Program.cs
index abafbbac..5528dcfb 100644
--- a/SPTarkov.Server/Program.cs
+++ b/SPTarkov.Server/Program.cs
@@ -1,6 +1,7 @@
 using System.Runtime;
 using Serilog;
 using Serilog.Exceptions;
+using Serilog.Settings.Configuration;
 using SPTarkov.Common.Semver;
 using SPTarkov.Common.Semver.Implementations;
 using SPTarkov.DI;
@@ -94,25 +95,22 @@ public static class Program
     {
         var builder = WebApplication.CreateBuilder(args);
         builder.Logging.ClearProviders();
+        builder.Configuration.SetBasePath(Directory.GetCurrentDirectory());
 
         if (ProgramStatics.DEBUG())
         {
-            builder.Configuration.AddJsonFile("appsettings.Development.json", true, true);
+            builder.Configuration.AddJsonFile("./appsettings.Development.json", true, true);
         }
         else
         {
-            builder.Configuration.AddJsonFile("appsettings.json", true, true);
+            builder.Configuration.AddJsonFile("./appsettings.json", true, true);
         }
 
         builder.Host.UseSerilog((context, provider, logger) =>
         {
             logger
                 .ReadFrom.Configuration(context.Configuration)
-                .ReadFrom.Services(provider)
-                .Enrich.FromLogContext()
-                .Enrich.WithExceptionDetails()
-                .Enrich.WithThreadName()
-                .Enrich.WithThreadId();
+                .ReadFrom.Services(provider);
         });
 
         return builder;
diff --git a/SPTarkov.Server/appsettings.Development.json b/SPTarkov.Server/appsettings.Development.json
index d54831b7..17203199 100644
--- a/SPTarkov.Server/appsettings.Development.json
+++ b/SPTarkov.Server/appsettings.Development.json
@@ -2,7 +2,13 @@
     "Serilog": {
         "Using": [
             "Serilog.Sinks.Console",
-            "Serilog.Sinks.File"
+            "Serilog.Sinks.File",
+            "Serilog.Sinks.Async",
+            "Serilog.Settings.Configuration",
+            "Serilog.Expressions",
+            "Serilog.Exceptions",
+            "Serilog.Enrichers.Context",
+            "Serilog.Enrichers.Thread"
         ],
         "MinimumLevel": {
             "Default": "Verbose",
diff --git a/SPTarkov.Server/appsettings.json b/SPTarkov.Server/appsettings.json
index fad010ad..27d51757 100644
--- a/SPTarkov.Server/appsettings.json
+++ b/SPTarkov.Server/appsettings.json
@@ -2,12 +2,18 @@
     "Serilog": {
         "Using": [
             "Serilog.Sinks.Console",
-            "Serilog.Sinks.File"
+            "Serilog.Sinks.File",
+            "Serilog.Sinks.Async",
+            "Serilog.Settings.Configuration",
+            "Serilog.Expressions",
+            "Serilog.Exceptions",
+            "Serilog.Enrichers.Context",
+            "Serilog.Enrichers.Thread"
         ],
         "MinimumLevel": {
-            "Default": "Verbose",
+            "Default": "Information",
             "Override": {
-                "Microsoft": "Verbose"
+                "Microsoft": "Information"
             }
         },
         "WriteTo": [