Skip the :race_condition_ttl branch if the option is 0 or nil.
#19296
+22
−10
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
… fixes an issue with the redis cache, where this code will sometimes throw an error out of SETEX when passing 0 as the `expires_at`.
| @@ -566,8 +566,8 @@ def find_cached_entry(key, name, options) | |||
| def handle_expired_entry(entry, key, options) | |||
| if entry && entry.expired? | |||
| race_ttl = options[:race_condition_ttl].to_i | |||
| if race_ttl && (Time.now.to_f - entry.expires_at <= race_ttl) | |||
| # When an entry has :race_condition_ttl defined, put the stale entry back into the cache | |||
| if (race_ttl > 0) && (Time.now.to_f - entry.expires_at <= race_ttl) | |||
There was a problem hiding this comment.
if race_ttl is nil it will now raise a NoMethodError
There was a problem hiding this comment.
race_ttl = options[:race_condition_ttl].to_i will never be nil
There was a problem hiding this comment.
Yup! nil.to_i evaluates to 0 and 0 is truthy in ruby.
ttl = nil.to_i
puts ttl
if ttl
puts "I am a tautology."
end
Outputs
0
I am a tautology.
|
@rafaelfranca @egilburg Ping. Is there anything I need to do here? |
|
@Wildebeest no it's ok. I know 0 is truthy, I just didn't realize the old code already checked for it (meaning the old code before your patch didn't actually check anything meaningful, because essentially it always checked |
|
Sweet. Thanks! :) |
rafaelfranca
added a commit
that referenced
this pull request
Mar 17, 2015
Skip the `:race_condition_ttl` branch if the option is 0 or nil.
rafaelfranca
added a commit
that referenced
this pull request
Mar 17, 2015
Skip the `:race_condition_ttl` branch if the option is 0 or nil.
rafaelfranca
added a commit
that referenced
this pull request
Mar 17, 2015
Skip the `:race_condition_ttl` branch if the option is 0 or nil.
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.
This fixes an issue with the redis cache, where this code will sometimes throw an error out of SETEX when passing 0 as the
expires_at.