diff options
author | Job van der Voort <jobvandervoort@gmail.com> | 2015-04-21 16:21:51 +0200 |
---|---|---|
committer | Job van der Voort <jobvandervoort@gmail.com> | 2015-04-21 16:21:51 +0200 |
commit | a8e93b7f51d968c1380ed210499869b62b07fd15 (patch) | |
tree | c864e80dfd9cf4f83fcede678acc986e3a125bf5 /config/initializers/4_sidekiq.rb | |
parent | 0625b15a481b3a3edd88110b3c18031ad9068d2f (diff) | |
download | gitlab-ce-a8e93b7f51d968c1380ed210499869b62b07fd15.tar.gz |
Version 7.10.0.rc5v7.10.0.rc5
Diffstat (limited to 'config/initializers/4_sidekiq.rb')
-rw-r--r-- | config/initializers/4_sidekiq.rb | 27 |
1 files changed, 0 insertions, 27 deletions
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 |