Automatic calculation was incorrect, now only doing calculations in o…

…ne place to not have any confusion.
ramonsmits · Nov 19, 2017 · e7390f7 · e7390f7
1 parent c87061c
commit e7390f7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/src/NServiceBus.RateLimiter/NServiceBus.RateLimiter.csproj b/src/NServiceBus.RateLimiter/NServiceBus.RateLimiter.csproj
@@ -3,13 +3,13 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <PackageId>NServiceBus.RateLimiter</PackageId>
-    <PackageVersion>1.0.0</PackageVersion>
+    <PackageVersion>1.0.1</PackageVersion>
     <Authors>ramonsmits</Authors>
     <Description>Rate Limiting NService Pipeline extension</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/ramonsmits/NServiceBus.RateLimiter</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/ramonsmits/NServiceBus.RateLimiter/blob/1.0.0/LICENSE</PackageLicenseUrl>
+    <PackageLicenseUrl>https://github.com/ramonsmits/NServiceBus.RateLimiter/blob/1.0.1/LICENSE</PackageLicenseUrl>
     <IncludeSymbols>True</IncludeSymbols>
     <IncludeSource>True</IncludeSource> 
     <RepositoryUrl>https://github.com/ramonsmits/NServiceBus.RateLimiter</RepositoryUrl>

diff --git a/src/NServiceBus.RateLimiter/Properties.cs b/src/NServiceBus.RateLimiter/Properties.cs
@@ -4,5 +4,4 @@ class Properties
 {
     public TimeSpan Duration;
     public int Limit;
-    public int Concurrency;
 }
diff --git a/src/NServiceBus.RateLimiter/RateLimiterConfigurationExtension.cs b/src/NServiceBus.RateLimiter/RateLimiterConfigurationExtension.cs
@@ -26,9 +26,8 @@ public static void ApplyRateLimiting(this EndpointConfiguration instance, int li
         {
             var properties = new global::Properties
             {
-                Duration = TimeSpan.FromSeconds(1),
-                Limit = limitPerSecond,
-                Concurrency = concurrency
+                Duration = TimeSpan.FromSeconds(1.0 / limitPerSecond * concurrency),
+                Limit = concurrency,
             };
             var settings = instance.GetSettings();
             settings.Set<global::Properties>(properties);
@@ -50,7 +49,6 @@ public static void ApplyRateLimiting(this EndpointConfiguration instance, int li
             {
                 Duration = duration,
                 Limit = limit,
-                Concurrency = limit
             };
             var settings = instance.GetSettings();
             settings.Set<global::Properties>(properties);

diff --git a/src/NServiceBus.RateLimiter/RateLimiterFeature.cs b/src/NServiceBus.RateLimiter/RateLimiterFeature.cs
@@ -7,8 +7,6 @@ protected override void Setup(FeatureConfigurationContext context)
     {
         if (!context.Settings.TryGet<Properties>(out var properties)) return;
 
-        var limit = properties.Concurrency;
-        var duration = TimeSpan.FromSeconds((double)limit / properties.Limit);
-        context.Pipeline.Register(behavior: new RateLimitBehavior(limit, duration), description: nameof(RateLimitBehavior));
+        context.Pipeline.Register(behavior: new RateLimitBehavior(properties.Limit, properties.Duration), description: nameof(RateLimitBehavior));
     }
 }