Merge pull request #1403 from NLog/fix-thread-aborted-exception2

Fix filetarget: Thread was being aborted (#2)
NLog · Apr 26, 2016 · 7cf3795 · 7cf3795
2 parents d36fd97 + 914fb1b
commit 7cf3795
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/NLog/Targets/FileTarget.cs b/src/NLog/Targets/FileTarget.cs
@@ -667,9 +667,14 @@ private void RefreshArchiveFilePatternToWatch()
                                     {
                                         Thread.Sleep(200);
                                     }
+                                    catch (ThreadAbortException ex)
+                                    {
+                                        //ThreadAbortException will be automatically re-thrown at the end of the try/catch/finally if ResetAbort isn't called.
+                                        Thread.ResetAbort();
+                                        InternalLogger.Trace(ex, "ThreadAbortException in Thread.Sleep");
+                                    }
                                     catch (Exception ex)
                                     {
-                                        //non-critical, this could be a ThreadAbortException
                                         InternalLogger.Warn(ex, "Exception in Thread.Sleep, most of the time not an issue.");
                                     }