Merge pull request #774 from remye06/fix-archiveoldfileonstartup-alt

FIxed ArchiveOldFileOnStartup with layout renderer used in ArchiveFileName
NLog · Jul 17, 2015 · ca37ae5 · ca37ae5
2 parents ef8f106 + ef5a316
commit ca37ae5
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/NLog/Targets/FileTarget.cs b/src/NLog/Targets/FileTarget.cs
@@ -674,7 +674,7 @@ protected override void Write(LogEventInfo logEvent)
                 this.DoAutoArchive(fileName, logEvent);
             }
 
-            this.WriteToFile(fileName, bytes, false);
+            this.WriteToFile(fileName, logEvent, bytes, false);
         }
 
         /// <summary>
@@ -779,7 +779,7 @@ private void FlushCurrentFileWrites(string currentFileName, LogEventInfo firstLo
                         this.DoAutoArchive(currentFileName, firstLogEvent);
                     }
 
-                    this.WriteToFile(currentFileName, ms.ToArray(), false);
+                    this.WriteToFile(currentFileName, firstLogEvent, ms.ToArray(), false);
                 }
             }
             catch (Exception exception)
@@ -1528,15 +1528,15 @@ private byte[] GetFooterBytes()
             */
         }
 
-        private void WriteToFile(string fileName, byte[] bytes, bool justData)
+        private void WriteToFile(string fileName, LogEventInfo logEvent, byte[] bytes, bool justData)
         {
             if (this.ReplaceFileContentsOnEachWrite)
             {
                 ReplaceFileContent(fileName, bytes);
                 return;
             }
 
-            bool writeHeader = InitializeFile(fileName, justData);
+            bool writeHeader = InitializeFile(fileName, logEvent, justData);
             BaseFileAppender appender = AllocateFileAppender(fileName);
 
             if (writeHeader)
@@ -1552,15 +1552,15 @@ private void WriteToFile(string fileName, byte[] bytes, bool justData)
             }
         }
 
-        private bool InitializeFile(string fileName, bool justData)
+        private bool InitializeFile(string fileName, LogEventInfo logEvent, bool justData)
         {
             bool writeHeader = false;
 
             if (!justData)
             {
                 if (!this.initializedFiles.ContainsKey(fileName))
                 {
-                    ProcessOnStartup(fileName);
+                    ProcessOnStartup(fileName, logEvent);
 
                     this.initializedFiles[fileName] = DateTime.Now;
                     this.initializedFilesCounter++;
@@ -1586,20 +1586,20 @@ private void WriteFooterAndUninitialize(string fileName)
             {
                 if (File.Exists(fileName))
                 {
-                    this.WriteToFile(fileName, footerBytes, true);
+                    this.WriteToFile(fileName, null, footerBytes, true);
                 }
             }
 
             this.initializedFiles.Remove(fileName);
         }
 
-        private void ProcessOnStartup(string fileName)
+        private void ProcessOnStartup(string fileName, LogEventInfo logEvent)
         {
             if (this.ArchiveOldFileOnStartup)
             {
                 try
                 {
-                    this.DoAutoArchive(fileName, null);
+                    this.DoAutoArchive(fileName, logEvent);
                 }
                 catch (Exception exception)
                 {