diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-22 13:15:15 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-08-22 13:15:15 +0000 |
| commit | 94cfd4adb21f4ebbb115978e022a88cd4cf03d69 (patch) | |
| tree | 91bc633a08b556137d2060838705d18fef32f30b /lib | |
| parent | 9b5ffb549d4a918dbfa6bab1f852decab09356de (diff) | |
| parent | 2bd0ed4a5cb70884f1a31a54fc67c4bc86fa3340 (diff) | |
| download | gitlab-ce-94cfd4adb21f4ebbb115978e022a88cd4cf03d69.tar.gz | |
Merge branch 'metrics-typo' into 'master'
Fix typo in gitlab-workhorse header
See merge request !5891
Diffstat (limited to 'lib')
| -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 56608b1b276..5d2d7d0026c 100644 --- a/lib/gitlab/middleware/rails_queue_duration.rb +++ b/lib/gitlab/middleware/rails_queue_duration.rb @@ -11,7 +11,7 @@ module Gitlab def call(env) trans = Gitlab::Metrics.current_transaction - proxy_start = env['HTTP_GITLAB_WORHORSE_PROXY_START'].presence + proxy_start = env['HTTP_GITLAB_WORKHORSE_PROXY_START'].presence if trans && proxy_start # Time in milliseconds since gitlab-workhorse started the request trans.set(:rails_queue_duration, Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000) |