Skip to content
Snippets Groups Projects
Commit 0841f052 authored by Stan Hu's avatar Stan Hu
Browse files

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
parents 5b23f2b0 1931c3ef
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -173,7 +173,7 @@ if Gitlab::Metrics.enabled? && !Rails.env.test? && !(Rails.env.development? && d
def connect(*args)
val = super
 
if current_transaction = Gitlab::Metrics::Transaction.current
if current_transaction = ::Gitlab::Metrics::Transaction.current
current_transaction.increment(:new_redis_connections, 1)
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment