Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-10-24 11:06:40 +0300
committerMichael Kozono <mkozono@gmail.com>2017-10-24 15:37:56 +0300
commitaaf8547e222bd5c3d98083c83c707b99ce17642d (patch)
tree84526bc949930a511743e8023a8cb8f24658e53f
parent0791a7793c0b48c656f61f3ddcaeb4038df345ce (diff)
Merge branch 'performance-bar-sql' into 'master'
Remove Sherlock usage from the performance bar Closes #39351 See merge request gitlab-org/gitlab-ce!15000 (cherry picked from commit 057c81b168c2aea0b4277ec748ce59c195032eaf) 189b5c3c Remove Sherlock usage from the performance bar
-rw-r--r--lib/gitlab/performance_bar/peek_query_tracker.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/performance_bar/peek_query_tracker.rb b/lib/gitlab/performance_bar/peek_query_tracker.rb
index 67fee8c227d..69e117f1da9 100644
--- a/lib/gitlab/performance_bar/peek_query_tracker.rb
+++ b/lib/gitlab/performance_bar/peek_query_tracker.rb
@@ -36,8 +36,8 @@ module Gitlab
end
def track_query(raw_query, bindings, start, finish)
- query = Gitlab::Sherlock::Query.new(raw_query, start, finish)
- query_info = { duration: query.duration.round(3), sql: query.formatted_query }
+ duration = finish - start
+ query_info = { duration: duration.round(3), sql: raw_query }
PEEK_DB_CLIENT.query_details << query_info
end