diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-20 15:07:13 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-20 22:31:39 -0800 |
| commit | eb51aa17cf457a735db5b6f136998576b6ffedc1 (patch) | |
| tree | edb54637a95cbe04ea6cc3e5dd6ff6ae76251658 | |
| parent | ac6673ddcfda0a0229b86f22543d31ddccc1dc55 (diff) | |
| download | gitlab-ce-sh-add-scoping-sidekiq-reload.tar.gz | |
Fix error when reloading code in Sidekiq during developmentsh-add-scoping-sidekiq-reload
Now that Rails 5 supports thread-safe code reload
(https://github.com/mperham/sidekiq/issues/2450), we encounter errors
when the Rails app code changes in development. We need to add `::` in
one middleware so that Object.const_missing will be invoked instead of
Metrics.const_missing.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54320
| -rw-r--r-- | lib/gitlab/middleware/rails_queue_duration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/middleware/rails_queue_duration.rb b/lib/gitlab/middleware/rails_queue_duration.rb index 96c6a0a7d28..a208f9d0420 100644 --- a/lib/gitlab/middleware/rails_queue_duration.rb +++ b/lib/gitlab/middleware/rails_queue_duration.rb @@ -29,7 +29,7 @@ module Gitlab def metric_rails_queue_duration_seconds @metric_rails_queue_duration_seconds ||= Gitlab::Metrics.histogram( :gitlab_rails_queue_duration_seconds, - Gitlab::Metrics::Transaction::BASE_LABELS + ::Gitlab::Metrics::Transaction::BASE_LABELS ) end end |