Merge pull request #331 from Particular/hotfix-6.2.10

Hotfix 6.2.10
Particular · May 2, 2018 · ca63cc4 · ca63cc4
2 parents f3d9dd7 + cfb193a
commit ca63cc4
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/NServiceBus.NHibernate/Outbox/NHibernateOutboxStorage.cs b/src/NServiceBus.NHibernate/Outbox/NHibernateOutboxStorage.cs
@@ -4,6 +4,7 @@ namespace NServiceBus.Features
     using System.Configuration;
     using System.Threading;
     using NHibernate.Mapping.ByCode;
+    using NServiceBus.Logging;
     using NServiceBus.Outbox;
     using NServiceBus.Outbox.NHibernate;
     using Configuration = NHibernate.Cfg.Configuration;
@@ -80,7 +81,12 @@ protected override void OnStart()
                     }
                 }
 
-                cleanupTimer = new Timer(PerformCleanup, null, TimeSpan.FromMinutes(1), frequencyToRunDeduplicationDataCleanup);
+                if (Timeout.InfiniteTimeSpan == frequencyToRunDeduplicationDataCleanup)
+                {
+                    Logger.InfoFormat("Outbox cleanup task is disabled.");
+                }
+
+                cleanupTimer = new Timer(PerformCleanup, null, frequencyToRunDeduplicationDataCleanup, Timeout.InfiniteTimeSpan);
             }
 
             protected override void OnStop()
@@ -109,8 +115,20 @@ void PerformCleanup(object state)
                         cleanupFailures = 0;
                     }
                 }
+                finally
+                {
+                    try
+                    {
+                        cleanupTimer.Change(frequencyToRunDeduplicationDataCleanup, Timeout.InfiniteTimeSpan);
+                    }
+                    catch (ObjectDisposedException)
+                    {
+                        // Ignore, can happen during graceful shutdown.
+                    }
+                }
             }
-
+
+            static readonly ILog Logger = LogManager.GetLogger(typeof(OutboxCleaner));
 // ReSharper disable NotAccessedField.Local
             Timer cleanupTimer;
 // ReSharper restore NotAccessedField.Local
@@ -121,4 +139,4 @@ void PerformCleanup(object state)
             TimeSpan frequencyToRunDeduplicationDataCleanup;
         }
     }
-}
+}