From f81fd8f35fe18ead7969632cfef32bf43ae67a16 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Fri, 3 May 2019 09:41:26 +0200 Subject: [PATCH] #5373 - Handle the serilog fallback pattern in log viewer. The fallback pattern is that a "_NNN" is added to the file name before the file extension, if the file is locked when serilog needs to write to it. --- src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs b/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs index 4c0e8ed4f8..9e6d911489 100644 --- a/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs +++ b/src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs @@ -39,7 +39,7 @@ namespace Umbraco.Core.Logging.Viewer for (var day = startDate.Date; day.Date <= endDate.Date; day = day.AddDays(1)) { //Filename ending to search for (As could be multiple) - var filesToFind = $"*{day:yyyyMMdd}.json"; + var filesToFind = GetSearchPattern(day); var filesForCurrentDay = Directory.GetFiles(logDirectory, filesToFind); @@ -52,6 +52,11 @@ namespace Umbraco.Core.Logging.Viewer return logSizeAsMegabytes <= FileSizeCap; } + private string GetSearchPattern(DateTime day) + { + return $"*{day:yyyyMMdd}*.json"; + } + protected override IReadOnlyList GetLogs(DateTimeOffset startDate, DateTimeOffset endDate, ILogFilter filter, int skip, int take) { var logs = new List(); @@ -66,7 +71,7 @@ namespace Umbraco.Core.Logging.Viewer for (var day = startDate.Date; day.Date <= endDate.Date; day = day.AddDays(1)) { //Filename ending to search for (As could be multiple) - var filesToFind = $"*{day:yyyyMMdd}.json"; + var filesToFind = GetSearchPattern(day); var filesForCurrentDay = Directory.GetFiles(logDirectory, filesToFind);