diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-07 15:52:58 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-07 15:52:58 +0100 |
| commit | 79938744a857874692439c7381e7ef62b5023b0e (patch) | |
| tree | a3ac22ba07afe9aec33cec53b5ce465765249c95 /lib | |
| parent | c3865bda0257506e3e9ba8352913eb288f0e3e34 (diff) | |
| parent | 61561a9eeb1dbb8273a1e8c8a5f37c0c01917c99 (diff) | |
| download | gitlab-ce-task-list-class.tar.gz | |
Merge branch 'master' into task-list-classtask-list-class
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/metrics/rack_middleware.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/metrics/transaction.rb | 8 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/gitlab/metrics/rack_middleware.rb b/lib/gitlab/metrics/rack_middleware.rb index 5c0587c4c51..e7a2f26d48b 100644 --- a/lib/gitlab/metrics/rack_middleware.rb +++ b/lib/gitlab/metrics/rack_middleware.rb @@ -32,8 +32,8 @@ module Gitlab def transaction_from_env(env) trans = Transaction.new - trans.add_tag(:request_method, env['REQUEST_METHOD']) - trans.add_tag(:request_uri, env['REQUEST_URI']) + trans.set(:request_uri, env['REQUEST_URI']) + trans.set(:request_method, env['REQUEST_METHOD']) trans end diff --git a/lib/gitlab/metrics/transaction.rb b/lib/gitlab/metrics/transaction.rb index 68b86de0655..73131cc6ef2 100644 --- a/lib/gitlab/metrics/transaction.rb +++ b/lib/gitlab/metrics/transaction.rb @@ -4,7 +4,7 @@ module Gitlab class Transaction THREAD_KEY = :_gitlab_metrics_transaction - attr_reader :uuid, :tags + attr_reader :tags, :values def self.current Thread.current[THREAD_KEY] @@ -12,7 +12,6 @@ module Gitlab def initialize @metrics = [] - @uuid = SecureRandom.uuid @started_at = nil @finished_at = nil @@ -38,7 +37,6 @@ module Gitlab end def add_metric(series, values, tags = {}) - tags = tags.merge(transaction_id: @uuid) prefix = sidekiq? ? 'sidekiq_' : 'rails_' @metrics << Metric.new("#{prefix}#{series}", values, tags) @@ -48,6 +46,10 @@ module Gitlab @values[name] += value end + def set(name, value) + @values[name] = value + end + def add_tag(key, value) @tags[key] = value end diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 0469c5a61c3..2dc2953e328 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -431,7 +431,7 @@ namespace :gitlab do try_fixing_it( "sudo chmod -R ug+rwX,o-rwx #{repo_base_path}", "sudo chmod -R ug-s #{repo_base_path}", - "find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s" + "sudo find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s" ) for_more_information( see_installation_guide_section "GitLab Shell" |