diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-10 12:14:29 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-10 12:14:29 +0000 |
| commit | 0841f052e6f643705edfb59e046790ee12840e03 (patch) | |
| tree | 7cb496c94fa45b885538a9aa98e0937421c334dc | |
| parent | 5b23f2b016f4e5d33387d7474148d2a59b213ee6 (diff) | |
| parent | 1931c3efc97af8cec59bfa1ad53b2c3be98118ae (diff) | |
| download | gitlab-ce-0841f052e6f643705edfb59e046790ee12840e03.tar.gz | |
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
| -rw-r--r-- | config/initializers/zz_metrics.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb index 462e8c811a6..151cad3ef9a 100644 --- a/config/initializers/zz_metrics.rb +++ b/config/initializers/zz_metrics.rb @@ -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 |