Merge pull request #210 from af83/0000-change-default-redis-server-host-to-localhost--v2

initializers/sidekiq: Don't set Redis URL in development or test

1 files changed, 8 insertions, 3 deletions

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index bc60dbe20..c2d5f9d6d 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -7,9 +7,14 @@ Sidekiq.configure_server do |config|
       pendings.map { |sync| sync.failed({error: 'Failed by Sidekiq reboot', processing_time: 0}) }
     end
   end
-  config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') }
 end
 
-Sidekiq.configure_client do |config|
-  config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') }
+unless Rails.env.test? || Rails.env.development?
+  Sidekiq.configure_server do |config|
+    config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') }
+  end
+
+  Sidekiq.configure_client do |config|
+    config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') }
+  end
 end