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 /// /// An exception associated with the logevent, or null. /// - public Exception Exception { get; set; } + public string Exception { get; set; } } }