Merge pull request #105 from jlkoneczny/OverridableThrottlingKey

Fixed ability to override ComputeThrottleKey
stefanprodan · Jul 30, 2017 · abde47c · abde47c
2 parents 7de833f + 5554ccb
commit abde47c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/WebApiThrottle/ThrottlingCore.cs b/WebApiThrottle/ThrottlingCore.cs
@@ -184,16 +184,14 @@ internal List<KeyValuePair<RateLimitPeriod, long>> RatesWithDefaults(List<KeyVal
             return defRates;
         }
 
-        internal ThrottleCounter ProcessRequest(RequestIdentity requestIdentity, TimeSpan timeSpan, RateLimitPeriod period, out string id)
+        internal ThrottleCounter ProcessRequest(TimeSpan timeSpan, string id)
         {
             var throttleCounter = new ThrottleCounter()
             {
                 Timestamp = DateTime.UtcNow,
                 TotalRequests = 1
             };
 
-            id = ComputeThrottleKey(requestIdentity, period);
-
             // serial reads and writes
             lock (ProcessLocker)
             {

diff --git a/WebApiThrottle/ThrottlingFilter.cs b/WebApiThrottle/ThrottlingFilter.cs
@@ -181,8 +181,8 @@ public override void OnActionExecuting(HttpActionContext actionContext)
                         if (rateLimit > 0)
                         {
                             // increment counter
-                            string requestId;
-                            var throttleCounter = core.ProcessRequest(identity, timeSpan, rateLimitPeriod, out requestId);
+                            var requestId = ComputeThrottleKey(identity, rateLimitPeriod); 
+                            var throttleCounter = core.ProcessRequest(timeSpan, requestId);
 
                             // check if key expired
                             if (throttleCounter.Timestamp + timeSpan < DateTime.UtcNow)

diff --git a/WebApiThrottle/ThrottlingHandler.cs b/WebApiThrottle/ThrottlingHandler.cs
@@ -177,8 +177,8 @@ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage reques
                 if (rateLimit > 0)
                 {
                     // increment counter
-                    string requestId;
-                    var throttleCounter = core.ProcessRequest(identity, timeSpan, rateLimitPeriod, out requestId);
+                    var requestId = ComputeThrottleKey(identity, rateLimitPeriod);
+                    var throttleCounter = core.ProcessRequest(timeSpan, requestId);
 
                     // check if key expired
                     if (throttleCounter.Timestamp + timeSpan < DateTime.UtcNow)

diff --git a/WebApiThrottle/ThrottlingMiddleware.cs b/WebApiThrottle/ThrottlingMiddleware.cs
@@ -173,8 +173,8 @@ public override async Task Invoke(IOwinContext context)
                 if (rateLimit > 0)
                 {
                     // increment counter
-                    string requestId;
-                    var throttleCounter = core.ProcessRequest(identity, timeSpan, rateLimitPeriod, out requestId);
+                    var requestId = ComputeThrottleKey(identity, rateLimitPeriod);
+                    var throttleCounter = core.ProcessRequest(timeSpan, requestId);
 
                     // check if key expired
                     if (throttleCounter.Timestamp + timeSpan < DateTime.UtcNow)