bug #38353 [RateLimiter] Call all compound limiters on failure and added IO blocking (wouterj)

fabpot · fabpot · commit f06f2f018eb8 · 2020-09-30T13:43:13.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [RateLimiter] Call all compound limiters on failure and added IO blocking | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Two small improvements that I missed in #38257: * Added `wait()` method, to be able to do logic like this: ```php while (!($limit = $limiter->consume())->isAccepted()) { $limit->wait(); } ``` * Fixed the `CompoundLimiter` to always call all limiters (even when one already blocks). This was the original behavior of the compound limiter and imho the best behavior (at least, it's always consistent and doesn't rely on the order of limiters - which is unsorted). Commits ------- 0279f88 Call all compound limiters on failure and added IO blocking
diff --git a/src/Symfony/Component/RateLimiter/CompoundLimiter.php b/src/Symfony/Component/RateLimiter/CompoundLimiter.php
@@ -37,10 +37,6 @@ public function consume(int $tokens = 1): Limit
         foreach ($this->limiters as $limiter) {
             $limit = $limiter->consume($tokens);
 
-            if (0 === $limit->getRemainingTokens()) {
-                return $limit;
-            }
-
             if (null === $minimalLimit || $limit->getRemainingTokens() < $minimalLimit->getRemainingTokens()) {
                 $minimalLimit = $limit;
             }
diff --git a/src/Symfony/Component/RateLimiter/Limit.php b/src/Symfony/Component/RateLimiter/Limit.php
@@ -43,4 +43,9 @@ public function getRemainingTokens(): int
     {
         return $this->availableTokens;
     }
+
+    public function wait(): void
+    {
+        sleep(($this->retryAfter->getTimestamp() - time()) * 1e6);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,9 @@ public function getRemainingTokens(): int`
`43`	`43`	`{`
`44`	`44`	`return $this->availableTokens;`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ public function wait(): void`
	`48`	`+ {`
	`49`	`+ sleep(($this->retryAfter->getTimestamp() - time()) * 1e6);`
	`50`	`+ }`
`46`	`51`	`}`