Bug fix in Throttler class check validation #2873
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
samsonasik
reviewed
Apr 23, 2020
jreklund
suggested changes
Apr 25, 2020
| @@ -139,8 +139,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1): | |||
| $tokenName = $this->prefix . $key; | |||
|
|
|||
| // Check to see if the bucket has even been created yet. | |||
| if (($tokens = $this->cache->get($tokenName)) === null) | |||
| { | |||
| if (($tokens = $this->cache->get($tokenName)) === null) { | |||
There was a problem hiding this comment.
This should be reverted to match CodeIgniters coding standard.
{ = should be on it's own line.
| // we need to decrement the number of available tokens. | ||
| if ($tokens > 0) | ||
| { |
There was a problem hiding this comment.
This should be reverted to match CodeIgniters coding standard.
{ = should be on it's own line.
| // we need to decrement the number of available tokens. | ||
| if ($tokens > 0) | ||
| { | ||
| if ($tokens >= 1) { |
There was a problem hiding this comment.
how about
if ($token)
|
I think I understand this, and it is a good move. @jlamim there are some good suggestions here, any chance you could take a pass at cleaning it up? |
|
It would be nice to have it fixed, but I think @jlamim is busy, so I'll merge it and then fix the code style myself. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
While I was structuring an example to compose my book, I found that even if I correctly set the parameters for the
check()method, a request was always executed more than the defined limit.This was because when checking for the existence of the cache (
($tokens = $this->cache->get($tokenName)) === null) if it was null,truewas returned, and just created the cache, without start the count, which always allowed one more request, because only the next time the counter would start.The
return truewas removed in this check and in checking the amount of tokens it was adjusted to$tokens> = 0.After these changes, the limit defined in
checkstarted to be applied successfully.Checklist: