Cleanse exceptions in event logs

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '1.25.3'
+  majorVersion: '1.25.4'
   minorVersion: $[counter('minorVersion', 1)]
   prowlarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'

src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs

@@ -60,33 +60,36 @@ namespace NzbDrone.Core.Instrumentation
         {
             try
             {
-                var log = new Log();
-                log.Time = logEvent.TimeStamp;
-                log.Message = CleanseLogMessage.Cleanse(logEvent.FormattedMessage);
-
-                log.Logger = logEvent.LoggerName;
+                var log = new Log
+                {
+                    Time = logEvent.TimeStamp,
+                    Logger = logEvent.LoggerName,
+                    Level = logEvent.Level.Name
+                };
 
                 if (log.Logger.StartsWith("NzbDrone."))
                 {
                     log.Logger = log.Logger.Remove(0, 9);
                 }
 
+                var message = logEvent.FormattedMessage;
+
                 if (logEvent.Exception != null)
                 {
-                    if (string.IsNullOrWhiteSpace(log.Message))
+                    if (string.IsNullOrWhiteSpace(message))
                     {
-                        log.Message = logEvent.Exception.Message;
+                        message = logEvent.Exception.Message;
                     }
                     else
                     {
-                        log.Message += ": " + logEvent.Exception.Message;
+                        message += ": " + logEvent.Exception.Message;
                     }
 
-                    log.Exception = logEvent.Exception.ToString();
+                    log.Exception = CleanseLogMessage.Cleanse(logEvent.Exception.ToString());
                     log.ExceptionType = logEvent.Exception.GetType().ToString();
                 }
 
-                log.Level = logEvent.Level.Name;
+                log.Message = CleanseLogMessage.Cleanse(message);
 
                 var connectionInfo = _connectionStringFactory.LogDbConnection;