summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Leitzen <pleitzen@gitlab.com>2019-02-10 11:30:37 +0100
committerPeter Leitzen <pleitzen@gitlab.com>2019-02-10 11:36:23 +0100
commit1931c3efc97af8cec59bfa1ad53b2c3be98118ae (patch)
tree7cb496c94fa45b885538a9aa98e0937421c334dc
parent5b23f2b016f4e5d33387d7474148d2a59b213ee6 (diff)
downloadgitlab-ce-1931c3efc97af8cec59bfa1ad53b2c3be98118ae.tar.gz
Fix error when reloading code in Sidekiqpl-copy-still-active
This commit fixes the following error in development: ArgumentError: A copy of Gitlab::Metrics::Transaction has been removed from the module tree but is still active!
-rw-r--r--config/initializers/zz_metrics.rb2
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