tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 20:10:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/13.4.0'

Browse Source
This commit is contained in:
Thiago Loureiro de Azevedo
2019-03-23 22:21:41 +01:00
parent 4286eb483a bd058c22ca
commit 6baba2c6c0
3 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Ocelot.Provider.Polly/CircuitBreaker.cs
View File

@@ -1,3 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Polly;
using Polly.CircuitBreaker; using Polly.CircuitBreaker;
using Polly.Timeout; using Polly.Timeout;
@@ -5,13 +8,16 @@ namespace Ocelot.Provider.Polly
{ {
public class CircuitBreaker public class CircuitBreaker
{ {
public CircuitBreaker(CircuitBreakerPolicy circuitBreakerPolicy, TimeoutPolicy timeoutPolicy) private readonly List<IAsyncPolicy> _policies = new List<IAsyncPolicy>();
public CircuitBreaker(params IAsyncPolicy[] policies)
{ {
CircuitBreakerPolicy = circuitBreakerPolicy; foreach (var policy in policies.Where(p => p != null))
TimeoutPolicy = timeoutPolicy; {
this._policies.Add(policy);
}
} }
public CircuitBreakerPolicy CircuitBreakerPolicy { get; private set; } public IAsyncPolicy[] Policies => this._policies.ToArray();
public TimeoutPolicy TimeoutPolicy { get; private set; }
} }
} }

2
src/Ocelot.Provider.Polly/PollyCircuitBreakingDelegatingHandler.cs
View File

@@ -25,7 +25,7 @@ namespace Ocelot.Provider.Polly
try try
{ {
return await Policy return await Policy
.WrapAsync(_qoSProvider.CircuitBreaker.CircuitBreakerPolicy, _qoSProvider.CircuitBreaker.TimeoutPolicy) .WrapAsync(_qoSProvider.CircuitBreaker.Policies)
.ExecuteAsync(() => base.SendAsync(request,cancellationToken)); .ExecuteAsync(() => base.SendAsync(request,cancellationToken));
} }
catch (BrokenCircuitException ex) catch (BrokenCircuitException ex)

49
src/Ocelot.Provider.Polly/PollyQoSProvider.cs
View File

@@ -22,27 +22,34 @@ namespace Ocelot.Provider.Polly
_timeoutPolicy = Policy.TimeoutAsync(TimeSpan.FromMilliseconds(reRoute.QosOptions.TimeoutValue), strategy); _timeoutPolicy = Policy.TimeoutAsync(TimeSpan.FromMilliseconds(reRoute.QosOptions.TimeoutValue), strategy);
_circuitBreakerPolicy = Policy if (reRoute.QosOptions.ExceptionsAllowedBeforeBreaking > 0)
.Handle<HttpRequestException>() {
.Or<TimeoutRejectedException>() _circuitBreakerPolicy = Policy
.Or<TimeoutException>() .Handle<HttpRequestException>()
.CircuitBreakerAsync( .Or<TimeoutRejectedException>()
exceptionsAllowedBeforeBreaking: reRoute.QosOptions.ExceptionsAllowedBeforeBreaking, .Or<TimeoutException>()
durationOfBreak: TimeSpan.FromMilliseconds(reRoute.QosOptions.DurationOfBreak), .CircuitBreakerAsync(
onBreak: (ex, breakDelay) => exceptionsAllowedBeforeBreaking: reRoute.QosOptions.ExceptionsAllowedBeforeBreaking,
{ durationOfBreak: TimeSpan.FromMilliseconds(reRoute.QosOptions.DurationOfBreak),
_logger.LogError( onBreak: (ex, breakDelay) =>
".Breaker logging: Breaking the circuit for " + breakDelay.TotalMilliseconds + "ms!", ex); {
}, _logger.LogError(
onReset: () => ".Breaker logging: Breaking the circuit for " + breakDelay.TotalMilliseconds + "ms!", ex);
{ },
_logger.LogDebug(".Breaker logging: Call ok! Closed the circuit again."); onReset: () =>
}, {
onHalfOpen: () => _logger.LogDebug(".Breaker logging: Call ok! Closed the circuit again.");
{ },
_logger.LogDebug(".Breaker logging: Half-open; next call is a trial."); onHalfOpen: () =>
} {
); _logger.LogDebug(".Breaker logging: Half-open; next call is a trial.");
}
);
}
else
{
_circuitBreakerPolicy = null;
}
CircuitBreaker = new CircuitBreaker(_circuitBreakerPolicy, _timeoutPolicy); CircuitBreaker = new CircuitBreaker(_circuitBreakerPolicy, _timeoutPolicy);
} }