Merge branch 'pl-copy-still-active' into 'master'
Fix error when reloading code in Sidekiq Closes #54320 See merge request gitlab-org/gitlab-ce!25069
This commit is contained in:
commit
0841f052e6
|
@ -173,7 +173,7 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d
|
||||||
def connect(*args)
|
def connect(*args)
|
||||||
val = super
|
val = super
|
||||||
|
|
||||||
if current_transaction = Gitlab::Metrics::Transaction.current
|
if current_transaction = ::Gitlab::Metrics::Transaction.current
|
||||||
current_transaction.increment(:new_redis_connections, 1)
|
current_transaction.increment(:new_redis_connections, 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue