From 7b56439ca1cbc384f1e9648f4ae983d3b39119d8 Mon Sep 17 00:00:00 2001 From: Dylan Dmitri Gray Date: Mon, 15 Jul 2019 15:28:51 -0700 Subject: [PATCH] Dylan/polishing (#12163) * fixed slnf path, fixed options comment, renames * cleaned up sample --- src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf | 2 +- .../Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs | 4 ++-- src/Middleware/ConcurrencyLimiter/sample/Startup.cs | 3 ++- .../src/QueuePolicies/QueuePolicyOptions.cs | 2 +- .../QueuePolicies/QueuePolicyServiceCollectionExtensions.cs | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf b/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf index cff033d73c..57a7824aae 100644 --- a/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf +++ b/src/Middleware/ConcurrencyLimiter/ConcurrencyLimiter.slnf @@ -1,6 +1,6 @@ { "solution": { - "path": "C:\\Users\\t-dygra\\Desktop\\AspNetCore\\src\\Middleware\\Middleware.sln", + "path": "..\\Middleware.sln", "projects": [ "..\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "..\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj", diff --git a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs index dd8206d528..7eec4a3840 100644 --- a/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs +++ b/src/Middleware/ConcurrencyLimiter/ref/Microsoft.AspNetCore.ConcurrencyLimiter.netcoreapp3.0.cs @@ -37,7 +37,7 @@ namespace Microsoft.Extensions.DependencyInjection { public static partial class QueuePolicyServiceCollectionExtensions { - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddStackQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } - public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddTailDropQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } + public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddFIFOQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } + public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddLIFOQueue(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action configure) { throw null; } } } diff --git a/src/Middleware/ConcurrencyLimiter/sample/Startup.cs b/src/Middleware/ConcurrencyLimiter/sample/Startup.cs index 618d6e56f6..6fe4e4a6b0 100644 --- a/src/Middleware/ConcurrencyLimiter/sample/Startup.cs +++ b/src/Middleware/ConcurrencyLimiter/sample/Startup.cs @@ -17,7 +17,7 @@ namespace ConcurrencyLimiterSample { public void ConfigureServices(IServiceCollection services) { - services.AddStackQueue((options) => { + services.AddLIFOQueue((options) => { options.MaxConcurrentRequests = Environment.ProcessorCount; options.RequestQueueLimit = 50; }); @@ -39,6 +39,7 @@ namespace ConcurrencyLimiterSample { new WebHostBuilder() .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) // for cert file .UseStartup() .Build() .Run(); diff --git a/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyOptions.cs b/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyOptions.cs index 53923ccd1b..e70eb66a27 100644 --- a/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyOptions.cs +++ b/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyOptions.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.ConcurrencyLimiter /// /// Maximum number of queued requests before the server starts rejecting connections with '503 Service Unavailible'. - /// Defaults to 5000 queued requests. + /// This option is highly application dependant, and must be configured by the application. /// public int RequestQueueLimit { get; set; } } diff --git a/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs b/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs index 021ae8278a..c11fe8fffa 100644 --- a/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs +++ b/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/QueuePolicyServiceCollectionExtensions.cs @@ -18,7 +18,7 @@ namespace Microsoft.Extensions.DependencyInjection /// Set the options used by the queue. /// Mandatory, since must be provided. /// - public static IServiceCollection AddTailDropQueue(this IServiceCollection services, Action configure) + public static IServiceCollection AddFIFOQueue(this IServiceCollection services, Action configure) { services.Configure(configure); services.AddSingleton(); @@ -32,7 +32,7 @@ namespace Microsoft.Extensions.DependencyInjection /// Set the options used by the queue. /// Mandatory, since must be provided. /// - public static IServiceCollection AddStackQueue(this IServiceCollection services, Action configure) + public static IServiceCollection AddLIFOQueue(this IServiceCollection services, Action configure) { services.Configure(configure); services.AddSingleton();