Merge pull request #1456 from bhaeussermann/branch0

FileTarget: Fix premature termination of appender-invalidator-thread.
NLog · May 12, 2016 · 754d190 · 754d190
2 parents 7a0d82d + 502a89a
commit 754d190
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 33 deletions.
diff --git a/src/NLog/Internal/FileAppenders/FileAppenderCache.cs b/src/NLog/Internal/FileAppenders/FileAppenderCache.cs
@@ -46,7 +46,7 @@ internal sealed class FileAppenderCache
 #if !SILVERLIGHT && !__IOS__ && !__ANDROID__
         private string archiveFilePatternToWatch = null;
         private readonly MultiFileWatcher externalFileArchivingWatcher = new MultiFileWatcher(NotifyFilters.FileName);
-        private readonly ManualResetEvent logFileArchiveWaitHandle = new ManualResetEvent(false);
+        private bool logFileWasArchived = false;
 #endif
 
         /// <summary>
@@ -87,22 +87,9 @@ public FileAppenderCache(int size, IFileAppenderFactory appenderFactory, ICreate
         private void ExternalFileArchivingWatcher_OnChange(object sender, FileSystemEventArgs e)
         {
             if ((e.ChangeType & WatcherChangeTypes.Created) == WatcherChangeTypes.Created)
-            {
-                LogFileWasArchived = true;
-                logFileArchiveWaitHandle.Set();
-            }
-        }
-
-        public bool LogFileWasArchived
-        {
-            get; private set;
+                logFileWasArchived = true;
         }
-
-        public EventWaitHandle LogArchiveWaitHandle
-        {
-            get { return logFileArchiveWaitHandle; }
-        }
-
+
         /// <summary>
         /// The archive file path pattern that is used to detect when archiving occurs.
         /// </summary>
@@ -115,7 +102,7 @@ public string ArchiveFilePatternToWatch
                 {
                     archiveFilePatternToWatch = value;
 
-                    LogFileWasArchived = false;
+                    logFileWasArchived = false;
                     externalFileArchivingWatcher.StopWatching();
                 }
             }
@@ -126,10 +113,10 @@ public string ArchiveFilePatternToWatch
         /// </summary>
         public void InvalidateAppendersForInvalidFiles()
         {
-            if (LogFileWasArchived)
+            if (logFileWasArchived)
             {
                 CloseAppenders();
-                LogFileWasArchived = false;
+                logFileWasArchived = false;
             }
         }
 #endif

diff --git a/src/NLog/Targets/FileTarget.cs b/src/NLog/Targets/FileTarget.cs
@@ -111,6 +111,7 @@ public class FileTarget : TargetWithLayoutHeaderAndFooter, ICreateFileParameters
 
 #if !SILVERLIGHT && !__IOS__ && !__ANDROID__
         private Thread appenderInvalidatorThread = null;
+        private EventWaitHandle stopAppenderInvalidatorThreadWaitHandle = new ManualResetEvent(false);
 #endif
 
         /// <summary>
@@ -724,16 +725,11 @@ private void RefreshArchiveFilePatternToWatch()
                                 {
                                     try
                                     {
-                                        this.fileAppenderCache.LogArchiveWaitHandle.WaitOne(200);
+                                        if (this.stopAppenderInvalidatorThreadWaitHandle.WaitOne(200))
+                                            break;
 
                                         lock (SyncRoot)
                                         {
-                                            if (!this.fileAppenderCache.LogFileWasArchived)
-                                            {
-                                                //ThreadAbortException will be automatically re-thrown at the end of the try/catch/finally if ResetAbort isn't called.
-                                                break;
-                                            }
-
                                             this.fileAppenderCache.InvalidateAppendersForInvalidFiles();
                                         }
                                     }
@@ -763,14 +759,8 @@ private void StopAppenderInvalidatorThread()
 #if !SILVERLIGHT && !__IOS__ && !__ANDROID__
             if (this.appenderInvalidatorThread != null)
             {
-
-                if (this.fileAppenderCache.LogFileWasArchived)
-                    this.fileAppenderCache.InvalidateAppendersForInvalidFiles();
-
-                this.fileAppenderCache.LogArchiveWaitHandle.Set();
-
+                this.stopAppenderInvalidatorThreadWaitHandle.Set();
                 this.appenderInvalidatorThread = null;
-
             }
 #endif
         }