chore: refactor redis config (#1310)

- refactor Redis config in Redis::Config Module
-  unit tests for Redis::Config module
This commit is contained in:
Abhishek
2020-10-05 20:01:10 +08:00
committed by GitHub
parent 1e1300c9d2
commit 77d380dd6b
4 changed files with 116 additions and 27 deletions

View File

@@ -1,24 +1,5 @@
app_redis_config = {
url: URI.parse(ENV.fetch('REDIS_URL', 'redis://127.0.0.1:6379')),
password: ENV.fetch('REDIS_PASSWORD', nil).presence
}
redis = Rails.env.test? ? MockRedis.new : Redis.new(Redis::Config.app)
if ENV['REDIS_SENTINELS'].presence
default_sentinel_port = '26379'
# expected format for REDIS_SENTINELS url string is host1:port1, host2:port2
sentinels = ENV['REDIS_SENTINELS'].split(',').map do |sentinel_url|
host, port = sentinel_url.split(':').map(&:strip)
{ host: host, port: port || default_sentinel_port, password: app_redis_config[:password] }
end
master_name = ENV.fetch('REDIS_SENTINEL_MASTER_NAME', 'mymaster')
# over-write redis url as redis://:<your-redis-password>@<master-name>/ when using sentinel
# more at https://github.com/redis/redis-rb/issues/531#issuecomment-263501322
app_redis_config[:url] = URI.parse("redis://#{master_name}")
app_redis_config[:sentinels] = sentinels
end
redis = Rails.env.test? ? MockRedis.new : Redis.new(app_redis_config)
# Alfred
# Add here as you use it for more features
# Used for Round Robin, Conversation Emails & Online Presence

View File

@@ -1,12 +1,7 @@
sidekiq_redis_config = {
url: ENV.fetch('REDIS_URL', 'redis://127.0.0.1:6379'),
password: ENV.fetch('REDIS_PASSWORD', nil).presence
}
Sidekiq.configure_client do |config|
config.redis = sidekiq_redis_config.merge(size: 25)
config.redis = Redis::Config.sidekiq
end
Sidekiq.configure_server do |config|
config.redis = sidekiq_redis_config.merge(size: 25)
config.redis = Redis::Config.sidekiq
end