Exclude :ssl_params from Redis options clone without ActiveSupport #4545
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
In dd0a847 we started filtering out SSL params from the Redis options cloning for logging purposes to prevent an undumpable `OpenSSL::X509::Store` from raising an exception. The fix used ActiveSupport's `Hash#except` to exclude the `:ssl_params` key from the hash before cloning the options hash by dumping and reloading. As ActiveSupport is not a requirement for Sidekiq, we need a more generally-available solution. This change removes the key using `Hash#slice` by including every top-level options key _except_ `:ssl_params`.
|
Thank you for the quick fix! |
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.
In dd0a847 we started filtering out SSL params from the Redis options
cloning for logging purposes to prevent an undumpable
OpenSSL::X509::Storefrom raising an exception. The fix usedActiveSupport's
Hash#exceptto exclude the:ssl_paramskey from thehash before cloning the options hash by dumping and reloading.
As ActiveSupport is not a requirement for Sidekiq, we need a more
generally-available solution. This change removes the key using
Hash#sliceby including every top-level options key except:ssl_params.See #4532 (comment)
cc: #4532