From 073d0e27a86bb53777745f18050d288dd4940fa9 Mon Sep 17 00:00:00 2001
From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
Date: Thu, 10 Aug 2023 23:14:37 +0100
Subject: [PATCH] core: restore stacktraces for UI 'view logs'. resolves #14585
 (#14619)

---
 src/Jackett.Common/Services/LogCacheService.cs | 8 ++++----
 src/Jackett.Common/Utils/LoggingSetup.cs       | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Jackett.Common/Services/LogCacheService.cs b/src/Jackett.Common/Services/LogCacheService.cs
index ff0c60376..9a97b1fe0 100644
--- a/src/Jackett.Common/Services/LogCacheService.cs
+++ b/src/Jackett.Common/Services/LogCacheService.cs
@@ -9,7 +9,7 @@ using NLog.Targets;
 namespace Jackett.Common.Services
 {
     [Target("LogService")]
-    public class LogCacheService : TargetWithLayout, ILogCacheService
+    public sealed class LogCacheService : TargetWithLayout, ILogCacheService
     {
         private static List<CachedLog> _Logs = new List<CachedLog>();
 
@@ -24,16 +24,16 @@ namespace Jackett.Common.Services
             }
         }
 
-        protected override void Write(LogEventInfo logEvent) => AddLog(logEvent);
+        protected override void Write(LogEventInfo logEvent) => AddLog(logEvent, Layout.Render(logEvent));
 
-        private static void AddLog(LogEventInfo logEvent)
+        private static void AddLog(LogEventInfo logEvent, string logMessage)
         {
             lock (_Logs)
             {
                 _Logs.Insert(0, new CachedLog
                 {
                     Level = logEvent.Level.Name,
-                    Message = CleanseLogMessage.Cleanse(logEvent.FormattedMessage),
+                    Message = CleanseLogMessage.Cleanse(logMessage),
                     When = logEvent.TimeStamp
                 });
 
diff --git a/src/Jackett.Common/Utils/LoggingSetup.cs b/src/Jackett.Common/Utils/LoggingSetup.cs
index eb372a92c..e9a7b3788 100644
--- a/src/Jackett.Common/Utils/LoggingSetup.cs
+++ b/src/Jackett.Common/Utils/LoggingSetup.cs
@@ -22,7 +22,7 @@ namespace Jackett.Common.Utils
 
             var logFile = new CleanseFileTarget
             {
-                Layout = "${longdate} ${level} ${message} ${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}",
+                Layout = "${longdate} ${level} ${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}",
                 FileName = Path.Combine(settings.DataFolder, logFileName),
                 ArchiveFileName = Path.Combine(settings.DataFolder, logFileName + ".{#####}.txt"),
                 ArchiveAboveSize = 2097152, // 2 MB
@@ -59,14 +59,17 @@ namespace Jackett.Common.Utils
             {
                 var logConsole = new ColoredConsoleTarget
                 {
-                    Layout = "${date:format=MM-dd HH\\:mm\\:ss} ${level} ${message} ${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}"
+                    Layout = "${date:format=MM-dd HH\\:mm\\:ss} ${level} ${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}"
                 };
                 logConfig.AddTarget("console", logConsole);
 
                 var logConsoleRule = new LoggingRule("*", logLevel, logConsole);
                 logConfig.LoggingRules.Add(logConsoleRule);
 
-                var logService = new LogCacheService();
+                var logService = new LogCacheService
+                {
+                    Layout = "${message}${onexception:inner=${newline}${newline}[v${assembly-version}] ${exception:format=ToString}${newline}}"
+                };
                 logConfig.AddTarget("service", logService);
 
                 var serviceRule = new LoggingRule("*", logLevel, logService);