diff options
author | Eugenia Grieff <egrieff@gitlab.com> | 2019-09-04 09:52:06 +0100 |
---|---|---|
committer | Eugenia Grieff <egrieff@gitlab.com> | 2019-09-04 09:52:06 +0100 |
commit | a3b4d920ba7791739300a9dcde0d18897b13afcb (patch) | |
tree | 52433c6cb061d1999ec8e40546718ea182593ba2 /lib/gitlab/gitaly_client.rb | |
parent | 9039a937661ea7190d1615b9b0141504afbb75dc (diff) | |
parent | fb9e8646bdb9f3f1382a86da890ff509f1b4549c (diff) | |
download | gitlab-ce-60372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-2.tar.gz |
Merge branch 'master' into 60372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-260372-milestone-link-prevent-delete-issue-after-move-it-to-another-project-2
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index d65c0d3e78d..2ac99b1ff02 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -157,7 +157,7 @@ module Gitlab # Keep track, separately, for the performance bar self.query_time += duration - if peek_enabled? + if Gitlab::PerformanceBar.enabled_for_request? add_call_details(feature: "#{service}##{rpc}", duration: duration, request: request_hash, rpc: rpc, backtrace: Gitlab::Profiler.clean_backtrace(caller)) end @@ -335,17 +335,13 @@ module Gitlab Gitlab::SafeRequestStore["gitaly_call_permitted"] = 0 end - def self.peek_enabled? - Gitlab::SafeRequestStore[:peek_enabled] - end - def self.add_call_details(details) Gitlab::SafeRequestStore['gitaly_call_details'] ||= [] Gitlab::SafeRequestStore['gitaly_call_details'] << details end def self.list_call_details - return [] unless peek_enabled? + return [] unless Gitlab::PerformanceBar.enabled_for_request? Gitlab::SafeRequestStore['gitaly_call_details'] || [] end |