Fix remarks

ThreeMammals · May 28, 2024 · 596793d · 596793d
1 parent 5c18640
commit 596793d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/src/Ocelot.Provider.Polly/PollyQoSProviderBase.cs b/src/Ocelot.Provider.Polly/PollyQoSProviderBase.cs
@@ -1,10 +1,29 @@
 using Ocelot.Configuration;
+using Ocelot.Configuration.File;
 using System.Net;
 
 namespace Ocelot.Provider.Polly;
 
 public abstract class PollyQoSProviderBase
 {
+    protected PollyQoSProviderBase(FileGlobalConfiguration global)
+    {
+        _global = global;
+        _requestTimeoutSeconds = _global.RequestTimeoutSeconds;
+    }
+
+    protected readonly FileGlobalConfiguration _global;
+
+    protected const int DefaultRequestTimeoutSeconds = 90;
+
+    private int? _requestTimeoutSeconds;
+
+    protected int RequestTimeoutSeconds
+    {
+        get => _requestTimeoutSeconds ?? _global?.RequestTimeoutSeconds ?? DefaultRequestTimeoutSeconds;
+        set => _requestTimeoutSeconds = value > 0 ? value : DefaultRequestTimeoutSeconds;
+    }
+
     protected static readonly HashSet<HttpStatusCode> ServerErrorCodes = new()
     {
         HttpStatusCode.InternalServerError,

diff --git a/src/Ocelot.Provider.Polly/PollyQoSResiliencePipelineProvider.cs b/src/Ocelot.Provider.Polly/PollyQoSResiliencePipelineProvider.cs
@@ -1,3 +1,4 @@
+using Microsoft.Extensions.Options;
 using Ocelot.Configuration;
 using Ocelot.Configuration.File;
 using Ocelot.Logging;
@@ -11,24 +12,16 @@ namespace Ocelot.Provider.Polly;
 /// <summary>
 /// Default provider for Polly V8 pipelines.
 /// </summary>
-public class PollyQoSResiliencePipelineProvider : PollyQoSProviderBase, IPollyQoSResiliencePipelineProvider<HttpResponseMessage>
+public class PollyQoSResiliencePipelineProvider 
+    : PollyQoSProviderBase, IPollyQoSResiliencePipelineProvider<HttpResponseMessage>
 {
     private readonly ResiliencePipelineRegistry<OcelotResiliencePipelineKey> _resiliencePipelineRegistry;
     private readonly IOcelotLogger _logger;
-
-    public const int DefaultRequestTimeoutSeconds = 90;
-    private int _requestTimeoutSeconds;
-
-    public int RequestTimeoutSeconds
-    {
-        get => _requestTimeoutSeconds > 0 ? _requestTimeoutSeconds : DefaultRequestTimeoutSeconds;
-        set => _requestTimeoutSeconds = value > 0 ? value : DefaultRequestTimeoutSeconds;
-    }
 
     public PollyQoSResiliencePipelineProvider(
         IOcelotLoggerFactory loggerFactory, 
         ResiliencePipelineRegistry<OcelotResiliencePipelineKey> resiliencePipelineRegistry,
-        FileGlobalConfiguration fileGlobalConfigure)
+        IOptions<FileGlobalConfiguration> global) : base(global.Value)
     {
         _resiliencePipelineRegistry = resiliencePipelineRegistry;
         _logger = loggerFactory.CreateLogger<PollyQoSResiliencePipelineProvider>();

diff --git a/src/Ocelot.Provider.Polly/v7/PollyQoSProvider.cs b/src/Ocelot.Provider.Polly/v7/PollyQoSProvider.cs
@@ -1,4 +1,5 @@
-using Ocelot.Configuration;
+using Microsoft.Extensions.Options;
+using Ocelot.Configuration;
 using Ocelot.Configuration.File;
 using Ocelot.Logging;
 using Polly.CircuitBreaker;
@@ -15,21 +16,12 @@ public class PollyQoSProvider : PollyQoSProviderBase, IPollyQoSProvider<HttpResp
 
     private readonly object _lockObject = new();
     private readonly IOcelotLogger _logger;
-
-    public const int DefaultRequestTimeoutSeconds = 90;
-
-    private int _requestTimeoutSeconds;
 
-    public int RequestTimeoutSeconds
-    {
-        get => _requestTimeoutSeconds > 0 ? _requestTimeoutSeconds : DefaultRequestTimeoutSeconds;
-        set => _requestTimeoutSeconds = value > 0 ? value : DefaultRequestTimeoutSeconds;
-    }
-
-    public PollyQoSProvider(IOcelotLoggerFactory loggerFactory, FileGlobalConfiguration fileGlobalConfiguration)
+    public PollyQoSProvider(
+        IOcelotLoggerFactory loggerFactory,
+        IOptions<FileGlobalConfiguration> global) : base(global.Value)
     {
         _logger = loggerFactory.CreateLogger<PollyQoSProvider>();
-        RequestTimeoutSeconds = fileGlobalConfiguration.RequestTimeoutSeconds ?? 0;
     }
 
     [Obsolete("Due to new v8 policy definition in Polly 8 (use GetResiliencePipeline in PollyQoSResiliencePipelineProvider)")]