diff --git a/src/Umbraco.Core/Configuration/Models/LoggingSettings.cs b/src/Umbraco.Core/Configuration/Models/LoggingSettings.cs index 414ff06b57..7d79bb83ae 100644 --- a/src/Umbraco.Core/Configuration/Models/LoggingSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/LoggingSettings.cs @@ -1,7 +1,9 @@ -namespace Umbraco.Core.Configuration.Models +using System; + +namespace Umbraco.Core.Configuration.Models { public class LoggingSettings { - public int MaxLogAge { get; set; } = -1; + public TimeSpan MaxLogAge { get; set; } = TimeSpan.FromHours(24); } } diff --git a/src/Umbraco.Infrastructure/HostedServices/LogScrubber.cs b/src/Umbraco.Infrastructure/HostedServices/LogScrubber.cs index c7b1e1eece..d01609e9a3 100644 --- a/src/Umbraco.Infrastructure/HostedServices/LogScrubber.cs +++ b/src/Umbraco.Infrastructure/HostedServices/LogScrubber.cs @@ -61,28 +61,9 @@ namespace Umbraco.Infrastructure.HostedServices using (var scope = _scopeProvider.CreateScope()) using (_profilingLogger.DebugDuration("Log scrubbing executing", "Log scrubbing complete")) { - _auditService.CleanLogs(GetLogScrubbingMaximumAgeInMinutes(_settings)); + _auditService.CleanLogs((int)_settings.MaxLogAge.TotalMinutes); scope.Complete(); } } - - private int GetLogScrubbingMaximumAgeInMinutes(LoggingSettings settings) - { - var maximumAge = 24 * 60; // 24 hours, in minutes - try - { - if (settings.MaxLogAge > -1) - { - maximumAge = settings.MaxLogAge; - } - } - catch (Exception ex) - { - _logger.LogError(ex, "Unable to locate a log scrubbing maximum age. Defaulting to 24 hours."); - } - - return maximumAge; - - } } } diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs index 06baa41432..2903a656df 100644 --- a/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs +++ b/src/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Logging; +using System; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; using NUnit.Framework; @@ -44,7 +45,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices } [Test] - public void Executes_And_Srubs_Logs() + public void Executes_And_Scrubs_Logs() { var sut = CreateLogScrubber(); sut.ExecuteAsync(null); @@ -57,7 +58,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Infrastructure.HostedServices { var settings = new LoggingSettings { - MaxLogAge = _maxLogAgeInMinutes, + MaxLogAge = TimeSpan.FromMinutes(_maxLogAgeInMinutes), }; var mockServerRegistrar = new Mock();