diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-16 18:10:03 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-04 17:00:09 +0200 |
| commit | 0163e27631fb993bd3541c09a95f0ef5e2026455 (patch) | |
| tree | b63cff41fe7d6e7433ecacfefd8be17e4fa29422 /config/initializers | |
| parent | ba7fcc9866588eb215fc69f5d8b73c77805e4eef (diff) | |
| download | gitlab-ce-0163e27631fb993bd3541c09a95f0ef5e2026455.tar.gz | |
Add Gitlab::Redis connection pool
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/session_store.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 3da5d46be92..70285255877 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -13,7 +13,7 @@ end if Rails.env.test? Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session" else - redis_config = Gitlab::RedisConfig.redis_store_options + redis_config = Gitlab::Redis.redis_store_options redis_config[:namespace] = 'session:gitlab' Gitlab::Application.config.session_store( diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index cc83137745a..9182d929809 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -2,7 +2,7 @@ SIDEKIQ_REDIS_NAMESPACE = 'resque:gitlab' Sidekiq.configure_server do |config| config.redis = { - url: Gitlab::RedisConfig.url, + url: Gitlab::Redis.url, namespace: SIDEKIQ_REDIS_NAMESPACE } @@ -29,7 +29,7 @@ end Sidekiq.configure_client do |config| config.redis = { - url: Gitlab::RedisConfig.url, + url: Gitlab::Redis.url, namespace: SIDEKIQ_REDIS_NAMESPACE } end |