From 055af32219c58ee1cfc6bbffab42b77915943d08 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Wed, 18 May 2022 11:20:35 +0200
Subject: [PATCH] Address missed NLog breaking change

---
 ArchiSteamFarm/IPC/ArchiKestrel.cs | 12 ------------
 ArchiSteamFarm/NLog/Logging.cs     | 25 +++++++++++++++++++------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ArchiSteamFarm/IPC/ArchiKestrel.cs b/ArchiSteamFarm/IPC/ArchiKestrel.cs
index de260903a..c1e457fde 100644
--- a/ArchiSteamFarm/IPC/ArchiKestrel.cs
+++ b/ArchiSteamFarm/IPC/ArchiKestrel.cs
@@ -34,7 +34,6 @@ using ArchiSteamFarm.NLog.Targets;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NLog.Web;
@@ -76,14 +75,6 @@ internal static class ArchiKestrel {
 		// Set default content root
 		builder.UseContentRoot(SharedInfo.HomeDirectory);
 
-		// Firstly initialize settings that user is free to override
-		builder.ConfigureLogging(
-			static logging => {
-				logging.ClearProviders();
-				logging.SetMinimumLevel(Debugging.IsUserDebugging ? LogLevel.Trace : LogLevel.Warning);
-			}
-		);
-
 		// Check if custom config is available
 		string absoluteConfigDirectory = Path.Combine(Directory.GetCurrentDirectory(), SharedInfo.ConfigDirectory);
 		string customConfigPath = Path.Combine(absoluteConfigDirectory, SharedInfo.IPCConfigFile);
@@ -104,9 +95,6 @@ internal static class ArchiKestrel {
 					ASF.ArchiLogger.LogGenericException(e);
 				}
 			}
-
-			// Use custom config for logging configuration
-			builder.ConfigureLogging(static (hostingContext, logging) => logging.AddConfiguration(hostingContext.Configuration.GetSection("Logging")));
 		}
 
 		// Enable NLog integration for logging
diff --git a/ArchiSteamFarm/NLog/Logging.cs b/ArchiSteamFarm/NLog/Logging.cs
index be380b904..5896d46b1 100644
--- a/ArchiSteamFarm/NLog/Logging.cs
+++ b/ArchiSteamFarm/NLog/Logging.cs
@@ -186,8 +186,7 @@ internal static class Logging {
 			};
 #pragma warning restore CA2000 // False positive, we're adding this disposable object to the global scope, so we can't dispose it
 
-			LogManager.Configuration.AddTarget(fileTarget);
-			LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
+			InitializeTarget(LogManager.Configuration, fileTarget);
 
 			LogManager.ReconfigExistingLoggers();
 		}
@@ -210,8 +209,7 @@ internal static class Logging {
 		ColoredConsoleTarget coloredConsoleTarget = new("ColoredConsole") { Layout = GeneralLayout };
 #pragma warning restore CA2000 // False positive, we're adding this disposable object to the global scope, so we can't dispose it
 
-		config.AddTarget(coloredConsoleTarget);
-		config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, coloredConsoleTarget));
+		InitializeTarget(config, coloredConsoleTarget);
 
 		LogManager.Configuration = config;
 	}
@@ -229,8 +227,7 @@ internal static class Logging {
 				MaxCount = 20
 			};
 
-			LogManager.Configuration.AddTarget(historyTarget);
-			LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, historyTarget));
+			InitializeTarget(LogManager.Configuration, historyTarget);
 
 			LogManager.ReconfigExistingLoggers();
 		}
@@ -396,6 +393,22 @@ internal static class Logging {
 		}
 	}
 
+	private static void InitializeTarget(LoggingConfiguration config, Target target) {
+		ArgumentNullException.ThrowIfNull(config);
+		ArgumentNullException.ThrowIfNull(target);
+
+		config.AddTarget(target);
+
+		if (!Debugging.IsUserDebugging) {
+			// Silence default ASP.NET logging
+			config.LoggingRules.Add(new LoggingRule("Microsoft*", target) { FinalMinLevel = LogLevel.Warn });
+			config.LoggingRules.Add(new LoggingRule("Microsoft.Hosting.Lifetime*", target) { FinalMinLevel = LogLevel.Info });
+			config.LoggingRules.Add(new LoggingRule("System*", target) { FinalMinLevel = LogLevel.Warn });
+		}
+
+		config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, target));
+	}
+
 	private static void OnConfigurationChanged(object? sender, LoggingConfigurationChangedEventArgs e) {
 		ArgumentNullException.ThrowIfNull(e);