From 7609593e4833e32064313148c616053022274408 Mon Sep 17 00:00:00 2001 From: Les Orchard Date: Fri, 14 Apr 2017 20:21:13 -0400 Subject: [PATCH] Add REDIS_DB env variable to configure Redis database (#1366) --- .env.production.sample | 1 + config/environments/production.rb | 4 +++- config/initializers/sidekiq.rb | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env.production.sample b/.env.production.sample index 1125eedbff5..9011dc21753 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -1,6 +1,7 @@ # Service dependencies REDIS_HOST=redis REDIS_PORT=6379 +# REDIS_DB=0 DB_HOST=db DB_USER=postgres DB_NAME=postgres diff --git a/config/environments/production.rb b/config/environments/production.rb index 0f107654424..80021287a52 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -55,6 +55,8 @@ Rails.application.configure do ENV['REDIS_HOST'] = redis_url.host ENV['REDIS_PORT'] = redis_url.port.to_s ENV['REDIS_PASSWORD'] = redis_url.password + db_num = redis_url.path[1..-1] + ENV['REDIS_DB'] = db_num if db_num.present? end # Use a different cache store in production. @@ -62,7 +64,7 @@ Rails.application.configure do host: ENV.fetch('REDIS_HOST') { 'localhost' }, port: ENV.fetch('REDIS_PORT') { 6379 }, password: ENV.fetch('REDIS_PASSWORD') { false }, - db: 0, + db: ENV.fetch('REDIS_DB') { 0 }, namespace: 'cache', expires_in: 10.minutes, } diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index ecdd07b08da..8ae3bd5a26c 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,11 +1,12 @@ host = ENV.fetch('REDIS_HOST') { 'localhost' } port = ENV.fetch('REDIS_PORT') { 6379 } password = ENV.fetch('REDIS_PASSWORD') { false } +db = ENV.fetch('REDIS_DB') { 0 } Sidekiq.configure_server do |config| - config.redis = { host: host, port: port, password: password} + config.redis = { host: host, port: port, db: db, password: password } end Sidekiq.configure_client do |config| - config.redis = { host: host, port: port, password: password } + config.redis = { host: host, port: port, db: db, password: password } end