diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-13 15:42:33 -0300 |
| commit | 5395e6175e77d3cd8800bb9f41c09d59934b502f (patch) | |
| tree | 2234488f40eb4f7aa6920fbe2ab41b1d6f53e14e /config/initializers/sidekiq.rb | |
| parent | 39d853f5bd9492fa8dfc8e07ec11070705d3c879 (diff) | |
| parent | c0678f2d281242601560e2646cab1aa8a349c4bb (diff) | |
| download | gitlab-ce-issue_3508.tar.gz | |
Merge branch 'master' into issue_3508issue_3508
Diffstat (limited to 'config/initializers/sidekiq.rb')
| -rw-r--r-- | config/initializers/sidekiq.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index cc83137745a..f1eec674888 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,9 +1,7 @@ -SIDEKIQ_REDIS_NAMESPACE = 'resque:gitlab' - Sidekiq.configure_server do |config| config.redis = { - url: Gitlab::RedisConfig.url, - namespace: SIDEKIQ_REDIS_NAMESPACE + url: Gitlab::Redis.url, + namespace: Gitlab::Redis::SIDEKIQ_NAMESPACE } config.server_middleware do |chain| @@ -29,7 +27,7 @@ end Sidekiq.configure_client do |config| config.redis = { - url: Gitlab::RedisConfig.url, - namespace: SIDEKIQ_REDIS_NAMESPACE + url: Gitlab::Redis.url, + namespace: Gitlab::Redis::SIDEKIQ_NAMESPACE } end |