FileTarget - Archive-cleanup should support weekday-format ddd

snakefoot · snakefoot · commit 3ab45e002738 · 2025-10-19T15:22:32.000+02:00
diff --git a/src/NLog/Targets/FileArchiveHandlers/BaseFileArchiveHandler.cs b/src/NLog/Targets/FileArchiveHandlers/BaseFileArchiveHandler.cs
@@ -87,6 +87,9 @@ protected bool DeleteOldFilesBeforeArchive(string fileDirectory, string fileWild
                 else if (maxArchiveFiles > 0)
                     maxArchiveFiles -= 1;
 
+                if (maxArchiveFiles >= fileInfos.Length && _fileTarget.MaxArchiveDays <= 0)
+                    return false;
+
                 var archiveCleanupReason = (_fileTarget.MaxArchiveFiles < 0 && _fileTarget.MaxArchiveDays > 0) ? $"MaxArchiveDays={_fileTarget.MaxArchiveDays}" : $"MaxArchiveFiles={_fileTarget.MaxArchiveFiles}";
                 if (initialFileOpen && _fileTarget.DeleteOldFileOnStartup)
                     archiveCleanupReason = "DeleteOldFileOnStartup=true";
@@ -187,15 +190,8 @@ public override string ToString()
             /// </summary>
             public static IEnumerable<FileInfo> CleanupFiles(FileInfo[] fileInfos, int maxArchiveFiles, int maxArchiveDays, int fileWildcardStartIndex, int fileWildcardEndIndex, bool parseArchiveSequenceNo, string? excludeFileName = null)
             {
-                if (fileInfos.Length <= 1)
-                {
-                    if (maxArchiveFiles == 0 && fileInfos.Length == 1 && !ExcludeFileName(fileInfos[0].Name, fileWildcardStartIndex, fileWildcardEndIndex, parseArchiveSequenceNo, excludeFileName))
-                        yield return fileInfos[0];
-                    yield break;
-                }
-
-                if (maxArchiveFiles >= fileInfos.Length && maxArchiveDays <= 0)
-                    yield break;
+                if (maxArchiveFiles == 0 && fileInfos.Length == 1 && !ExcludeFileName(fileInfos[0].Name, fileWildcardStartIndex, fileWildcardEndIndex, parseArchiveSequenceNo, excludeFileName))
+                    yield return fileInfos[0];
 
                 var fileInfoDates = new List<FileInfoDateTime>(fileInfos.Length);
                 foreach (var fileInfo in fileInfos)
