treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Add option to use native Ruby driver for Redis (#30717)

main-rebase-security-fix
Michael Stanclift 2024-06-17 07:28:01 -05:00 committed by GitHub
parent d7b7617321
commit d5f02adad7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/redis_configuration.rb
View File

@ -42,9 +42,13 @@ class RedisConfiguration
ENV['REDIS_URL']
end
def redis_driver
ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
end
private
def raw_connection
Redis.new(url: url, driver: :hiredis)
Redis.new(url: url, driver: redis_driver)
end
end

6
lib/mastodon/redis_config.rb
View File

@ -30,8 +30,10 @@ namespace = ENV.fetch('REDIS_NAMESPACE', nil)
cache_namespace = namespace ? "#{namespace}_cache" : 'cache'
sidekiq_namespace = namespace
redis_driver = ENV.fetch('REDIS_DRIVER', 'hiredis') == 'ruby' ? :ruby : :hiredis
REDIS_CACHE_PARAMS = {
driver: :hiredis,
driver: redis_driver,
url: ENV['CACHE_REDIS_URL'],
expires_in: 10.minutes,
namespace: "#{cache_namespace}:7.1",
@ -43,7 +45,7 @@ REDIS_CACHE_PARAMS = {
}.freeze
REDIS_SIDEKIQ_PARAMS = {
driver: :hiredis,
driver: redis_driver,
url: ENV['SIDEKIQ_REDIS_URL'],
namespace: sidekiq_namespace,
}.freeze