diff options
| author | James Lopez <james@gitlab.com> | 2019-02-12 19:06:28 +0300 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-02-12 19:06:28 +0300 |
| commit | b753fc6daddd9e599ff848c5347cd7fc15f6a7c4 (patch) | |
| tree | e32687bd311e95344e179a8f15ba199be889c8ec /app | |
| parent | c11466b90cbc6b6905e0ee43ff310a525c1474d3 (diff) | |
| parent | 51ca79228bc2d22b12d47ba177610d228793dc94 (diff) | |
Merge branch 'sh-log-rails-queue-duration' into 'master'
Log queue duration in production_json.log
Closes #57420
See merge request gitlab-org/gitlab-ce!25075
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 26cd5dc801f..af0b0c64814 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -137,6 +137,8 @@ class ApplicationController < ActionController::Base if response.status == 422 && response.body.present? && response.content_type == 'application/json'.freeze payload[:response] = response.body end + + payload[:queue_duration] = request.env[::Gitlab::Middleware::RailsQueueDuration::GITLAB_RAILS_QUEUE_DURATION_KEY] end ## |