From 3f59e3bd14cdefd4270233ed784a5704a8486e83 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Mon, 8 Jan 2018 14:38:55 +0100
Subject: initializers/sidekiq: Don't set Redis URL in development or test

Don't set this configuration in development and test environments to
enable Sidekiq to connect to the default Redis server by default without
setting the environment variable.
---
 config/initializers/sidekiq.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3