Merge branch 'release-1.15'

Particular · May 10, 2016 · aad16b2 · aad16b2
2 parents 1918d41 + 5b393cb
commit aad16b2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/ServiceControl/ExternalIntegrations/EventDispatcher.cs b/src/ServiceControl/ExternalIntegrations/EventDispatcher.cs
@@ -23,7 +23,7 @@ protected override void OnStart()
         {
             tokenSource = new CancellationTokenSource();
             circuitBreaker = new RepeatedFailuresOverTimeCircuitBreaker("EventDispatcher",
-                TimeSpan.FromMinutes(2),
+                TimeSpan.FromMinutes(5),
                 ex => CriticalError.Raise("Repeated failures when dispatching external integration events.", ex),
                 TimeSpan.FromSeconds(20));
             StartDispatcher();
@@ -65,6 +65,8 @@ private void DispatchEvents(CancellationToken token)
                 {
                     token.WaitHandle.WaitOne(TimeSpan.FromSeconds(1));
                 }
+
+                circuitBreaker.Success();
             }
         }