diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-09 11:14:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 11:14:32 +0200 |
| commit | fc8baba8cb26cdcb74f00a4c51c8a88f1ee3e7ac (patch) | |
| tree | 587dde695e2d6121bb8f0495e0c988ab0d3d1e3f /config/initializers | |
| parent | 5233e9910677c921ab93e0997964144b1df95a63 (diff) | |
| parent | 299ab28d5f1af7da5ec3688ebcbbf711f4567367 (diff) | |
Merge pull request #1533 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/sidekiq.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index fc85a3913..219554df4 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,14 +1,7 @@ # frozen_string_literal: true -namespace = ENV.fetch('REDIS_NAMESPACE') { nil } -redis_params = { url: ENV['REDIS_URL'], driver: :hiredis } - -if namespace - redis_params[:namespace] = namespace -end - Sidekiq.configure_server do |config| - config.redis = redis_params + config.redis = REDIS_SIDEKIQ_PARAMS config.server_middleware do |chain| chain.add SidekiqErrorHandler @@ -26,7 +19,7 @@ Sidekiq.configure_server do |config| end Sidekiq.configure_client do |config| - config.redis = redis_params + config.redis = REDIS_SIDEKIQ_PARAMS config.client_middleware do |chain| chain.add SidekiqUniqueJobs::Middleware::Client |