root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'metrics-typo' into 'master' 

Fix typo in gitlab-workhorse header

See merge request !5891
This commit is contained in:
Yorick Peterse 2016-08-22 13:15:15 +00:00
parent 9b5ffb549d 2bd0ed4a5c
commit 94cfd4adb2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITLAB_WORKHORSE_VERSION
View File

@ -1 +1 @@
0.7.8 0.7.10

2
doc/install/installation.md
View File

@ -397,7 +397,7 @@ If you are not using Linux you may have to run `gmake` instead of
cd /home/git cd /home/git
sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
cd gitlab-workhorse cd gitlab-workhorse
sudo -u git -H git checkout v0.7.8 sudo -u git -H git checkout v0.7.10
sudo -u git -H make sudo -u git -H make
### Initialize Database and Activate Advanced Features ### Initialize Database and Activate Advanced Features

2
lib/gitlab/middleware/rails_queue_duration.rb
View File

@ -11,7 +11,7 @@ module Gitlab
def call(env) def call(env)
trans = Gitlab::Metrics.current_transaction 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 if trans && proxy_start
# Time in milliseconds since gitlab-workhorse started the request # 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) trans.set(:rails_queue_duration, Time.now.to_f * 1_000 - proxy_start.to_f / 1_000_000)

2
spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
View File

@ -22,7 +22,7 @@ describe Gitlab::Middleware::RailsQueueDuration do
end end
it 'sets proxy_flight_time and calls the app when the header is present' do it 'sets proxy_flight_time and calls the app when the header is present' do
env['HTTP_GITLAB_WORHORSE_PROXY_START'] = '123' env['HTTP_GITLAB_WORKHORSE_PROXY_START'] = '123'
expect(transaction).to receive(:set).with(:rails_queue_duration, an_instance_of(Float)) expect(transaction).to receive(:set).with(:rails_queue_duration, an_instance_of(Float))
expect(middleware.call(env)).to eq('yay') expect(middleware.call(env)).to eq('yay')
end end