From c3fa12be6e4d03aaaeea2908302640cc0c5b3896 Mon Sep 17 00:00:00 2001
From: Warren <warren@umbraco.com>
Date: Thu, 30 Aug 2018 16:24:34 +0100
Subject: [PATCH] Exception needs to be a string as Serilog cant easily convert
 JSON serialised EX back to proper exceptions so we call ToString on it
 instead

---
 src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs | 4 ++--
 src/Umbraco.Core/Logging/Viewer/LogMessage.cs    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs b/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
index 905e21c45e..b3f4b352d1 100644
--- a/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
+++ b/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Logging.Viewer
         public int GetNumberOfErrors(DateTimeOffset startDate, DateTimeOffset endDate)
         {
             var logs = GetAllLogs(startDate, endDate);
-            return logs.Count(x => x.Level == LogEventLevel.Fatal && x.Level == LogEventLevel.Error && x.Exception != null);
+            return logs.Count(x => x.Level == LogEventLevel.Fatal || x.Level == LogEventLevel.Error || x.Exception != null);
         }
 
         public LogLevelCounts GetLogLevelCounts(DateTimeOffset startDate, DateTimeOffset endDate)
@@ -115,7 +115,7 @@ namespace Umbraco.Core.Logging.Viewer
                     Timestamp = x.Timestamp,
                     Level = x.Level,
                     MessageTemplateText = x.MessageTemplate.Text,
-                    Exception = x.Exception,
+                    Exception = x.Exception?.ToString(),
                     Properties = x.Properties,
                     RenderedMessage = x.RenderMessage()
                 });           
diff --git a/src/Umbraco.Core/Logging/Viewer/LogMessage.cs b/src/Umbraco.Core/Logging/Viewer/LogMessage.cs
index 86d136be43..c03b26fa98 100644
--- a/src/Umbraco.Core/Logging/Viewer/LogMessage.cs
+++ b/src/Umbraco.Core/Logging/Viewer/LogMessage.cs
@@ -37,6 +37,6 @@ namespace Umbraco.Core.Logging.Viewer
         /// <summary>
         /// An exception associated with the logevent, or null.
         /// </summary>
-        public Exception Exception { get; set; }
+        public string Exception { get; set; }
     }
 }