Fix Remarks

ThreeMammals · hogwartsdeveloper · May 25, 2024 · May 25, 2024 · May 26, 2024 · May 27, 2024
commit e914ca6ec6b13e98caf6df47e8bcfb2594fa5117
diff --git a/src/Ocelot/Configuration/Creator/TimeoutCreator.cs b/src/Ocelot/Configuration/Creator/TimeoutCreator.cs
@@ -8,7 +8,7 @@ public int Create(FileRoute fileRoute, FileGlobalConfiguration globalConfigurati
         {
             return fileRoute.Timeout > 0 
                 ? fileRoute.Timeout 
-                : (globalConfiguration.RequestTimeoutSeconds ?? 0) * 1000;
+                : globalConfiguration.RequestTimeoutSeconds * 1000;
         }
     }
 }
diff --git a/src/Ocelot/Configuration/File/FileGlobalConfiguration.cs b/src/Ocelot/Configuration/File/FileGlobalConfiguration.cs
@@ -13,11 +13,12 @@ public FileGlobalConfiguration()
             HttpHandlerOptions = new FileHttpHandlerOptions();
             CacheOptions = new FileCacheOptions();
             MetadataOptions = new FileMetadataOptions();
+            RequestTimeoutSeconds = 90;
         }
 
         public string RequestIdKey { get; set; }
 
-        public int? RequestTimeoutSeconds { get; set; }
+        public int RequestTimeoutSeconds { get; set; }
 
         public FileServiceDiscoveryProvider ServiceDiscoveryProvider { get; set; }
 

diff --git a/src/Ocelot/Requester/MessageInvokerPool.cs b/src/Ocelot/Requester/MessageInvokerPool.cs
@@ -33,16 +33,6 @@ public HttpMessageInvoker Get(DownstreamRoute downstreamRoute)
     }
 
     public void Clear() => _handlersPool.Clear();
-
-    public const int DefaultRequestTimeoutSeconds = 90;
-
-    private int _requestTimeoutSeconds;
-
-    public int RequestTimeoutSeconds
-    {
-        get => _requestTimeoutSeconds > 0 ? _requestTimeoutSeconds : DefaultRequestTimeoutSeconds;
-        set => _requestTimeoutSeconds = value > 0 ? value : DefaultRequestTimeoutSeconds;
-    }
 
     private HttpMessageInvoker CreateMessageInvoker(DownstreamRoute downstreamRoute)
     {
@@ -60,9 +50,7 @@ private HttpMessageInvoker CreateMessageInvoker(DownstreamRoute downstreamRoute)
         // It's standard behavior to throw TimeoutException after the defined timeout (90 seconds by default)
         var timeoutHandler = new TimeoutDelegatingHandler(downstreamRoute.QosOptions.TimeoutValue > 0
             ? TimeSpan.FromMilliseconds(downstreamRoute.QosOptions.TimeoutValue)
-            : downstreamRoute.Timeout > 0
-                ? TimeSpan.FromMilliseconds(downstreamRoute.Timeout)
-                : TimeSpan.FromSeconds(RequestTimeoutSeconds))
+            : TimeSpan.FromMilliseconds(downstreamRoute.Timeout))
         {
             InnerHandler = baseHandler,
         };