diff options
Diffstat (limited to 'config/initializers/7_redis.rb')
| -rw-r--r-- | config/initializers/7_redis.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb index 25c2c6aa11f..040257535f8 100644 --- a/config/initializers/7_redis.rb +++ b/config/initializers/7_redis.rb @@ -27,6 +27,8 @@ Redis::Cluster::SlotLoader.prepend(Gitlab::Patch::SlotLoader) Redis::Cluster::CommandLoader.prepend(Gitlab::Patch::CommandLoader) Redis::Cluster.prepend(Gitlab::Patch::RedisCluster) +ConnectionPool.prepend(Gitlab::Instrumentation::ConnectionPool) + if Gitlab::Redis::Workhorse.params[:cluster].present? raise "Do not configure workhorse with a Redis Cluster as pub/sub commands are not cluster-compatible." end @@ -37,5 +39,5 @@ end # 2. Rails.cache # 3. HTTP clients Gitlab::Redis::ALL_CLASSES.each do |redis_instance| - redis_instance.with { nil } + redis_instance.with { nil } unless redis_instance == Gitlab::Redis::ClusterSharedState end |