about summary refs log tree commit diff
path: root/lib/mastodon
diff options
context:
space:
mode:
authorTakeshi Umeda <noel.yoshiba@gmail.com>2021-05-09 17:40:17 +0900
committerGitHub <noreply@github.com>2021-05-09 10:40:17 +0200
commit9b18914c3572be5b661e4d8e31578fae4ee347be (patch)
treebdca05c193a2c9833c088939175cc7970cfc9856 /lib/mastodon
parentf9c2d1b9a1c1e3f6b3d79b6d2edefe4f4f5cf2a6 (diff)
Add a Redis environment variable for sidekiq (#16188)
Diffstat (limited to 'lib/mastodon')
-rw-r--r--lib/mastodon/redis_config.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
index d341a8484..5bfd26e34 100644
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -22,9 +22,11 @@ end
 
 setup_redis_env_url
 setup_redis_env_url(:cache, false)
+setup_redis_env_url(:sidekiq, false)
 
-namespace       = ENV.fetch('REDIS_NAMESPACE', nil)
-cache_namespace = namespace ? namespace + '_cache' : 'cache'
+namespace         = ENV.fetch('REDIS_NAMESPACE', nil)
+cache_namespace   = namespace ? namespace + '_cache' : 'cache'
+sidekiq_namespace = namespace
 
 REDIS_CACHE_PARAMS = {
   driver: :hiredis,
@@ -32,3 +34,9 @@ REDIS_CACHE_PARAMS = {
   expires_in: 10.minutes,
   namespace: cache_namespace,
 }.freeze
+
+REDIS_SIDEKIQ_PARAMS = {
+  driver: :hiredis,
+  url: ENV['SIDEKIQ_REDIS_URL'],
+  namespace: sidekiq_namespace,
+}.freeze