From d490e07ea2c5d2686e2f3a7384b81b0cd112da8e Mon Sep 17 00:00:00 2001 From: DualFroz Date: Sun, 4 Oct 2026 18:09:36 +0200 Subject: [PATCH] CachedUntil - Renamed CachedUntilOption to CachedUntilLifetime --- .../Wrappers/CachedLayoutRendererWrapper.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/NLog/LayoutRenderers/Wrappers/CachedLayoutRendererWrapper.cs b/src/NLog/LayoutRenderers/Wrappers/CachedLayoutRendererWrapper.cs index 7247723..11f67c2 100644 --- a/src/NLog/LayoutRenderers/Wrappers/CachedLayoutRendererWrapper.cs +++ b/src/NLog/LayoutRenderers/Wrappers/CachedLayoutRendererWrapper.cs @@ -73,7 +73,7 @@ namespace NLog.LayoutRenderers.Wrappers /// /// A value indicating when the cached value expires, because the time of the has moved into a new period. /// - public enum CachedUntilOption + public enum CachedUntilLifetime { /// Never expire the cached value because of the time. None = 0, @@ -88,7 +88,7 @@ namespace NLog.LayoutRenderers.Wrappers private string? _renderedCacheKey; private DateTime? _cachedValueExpires; private TimeSpan? _cachedValueTimeout; - private CachedUntilOption _cachedUntil; + private CachedUntilLifetime _cachedUntil; /// /// Gets or sets a value indicating whether this is enabled. @@ -130,15 +130,15 @@ namespace NLog.LayoutRenderers.Wrappers /// /// Gets or sets when the cached value should expire, so it is reset exactly when the hour or day of the LogEvent TimeStamp changes. Example HourChange will reset the cached value at the start of every hour. /// - /// Default: + /// Default: /// - public CachedUntilOption CachedUntil + public CachedUntilLifetime CachedUntil { get => _cachedUntil; set { _cachedUntil = value; - if (_cachedUntil != CachedUntilOption.None) + if (_cachedUntil != CachedUntilLifetime.None) Cached = true; } } @@ -209,9 +209,9 @@ namespace NLog.LayoutRenderers.Wrappers private DateTime? ResolveCachedValueExpires(DateTime timeStamp) { DateTime? expires = _cachedValueTimeout.HasValue ? timeStamp + _cachedValueTimeout.Value : null; - if (_cachedUntil != CachedUntilOption.None) + if (_cachedUntil != CachedUntilLifetime.None) { - var periodTicks = _cachedUntil == CachedUntilOption.DayChange ? TimeSpan.TicksPerDay : TimeSpan.TicksPerHour; + var periodTicks = _cachedUntil == CachedUntilLifetime.DayChange ? TimeSpan.TicksPerDay : TimeSpan.TicksPerHour; var periodStart = new DateTime(timeStamp.Ticks - timeStamp.Ticks % periodTicks, timeStamp.Kind); // Inclusive end, so the last period ends at DateTime.MaxValue without overflow var periodEnd = periodStart.AddTicks(periodTicks - 1);