From a8e93b7f51d968c1380ed210499869b62b07fd15 Mon Sep 17 00:00:00 2001
From: Job van der Voort <jobvandervoort@gmail.com>
Date: Tue, 21 Apr 2015 16:21:51 +0200
Subject: Version 7.10.0.rc5

---
 config/initializers/4_sidekiq.rb | 27 ---------------------------
 1 file changed, 27 deletions(-)
 delete mode 100644 config/initializers/4_sidekiq.rb

(limited to 'config/initializers/4_sidekiq.rb')

diff --git a/config/initializers/4_sidekiq.rb b/config/initializers/4_sidekiq.rb
deleted file mode 100644
index e856499732e..00000000000
--- a/config/initializers/4_sidekiq.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Custom Redis configuration
-config_file = Rails.root.join('config', 'resque.yml')
-
-resque_url = if File.exists?(config_file)
-               YAML.load_file(config_file)[Rails.env]
-             else
-               "redis://localhost:6379"
-             end
-
-Sidekiq.configure_server do |config|
-  config.redis = {
-    url: resque_url,
-    namespace: 'resque:gitlab'
-  }
-
-  config.server_middleware do |chain|
-    chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS']
-    chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
-  end
-end
-
-Sidekiq.configure_client do |config|
-  config.redis = {
-    url: resque_url,
-    namespace: 'resque:gitlab'
-  }
-end
-- 
cgit v1.2.3