summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-02-21 16:27:05 +1100
committerDylan Griffith <dyl.griffith@gmail.com>2018-02-21 16:27:05 +1100
commit2e216dd43bb02d741b2fcbfc1fe40042ad85a590 (patch)
tree061a3b26283b22f0aee7bc960a9f7ae1440f72ec /lib
parent11bf575fe64e55cc932c5629e2d8d103109e0b2b (diff)
downloadgitlab-ce-2e216dd43bb02d741b2fcbfc1fe40042ad85a590.tar.gz
Do not count rails sql cache as queries in query limitingquery-counting-should-not-include-cached-queries
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/query_limiting/active_support_subscriber.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/query_limiting/active_support_subscriber.rb b/lib/gitlab/query_limiting/active_support_subscriber.rb
index 66049c94ec6..4c83581c4b1 100644
--- a/lib/gitlab/query_limiting/active_support_subscriber.rb
+++ b/lib/gitlab/query_limiting/active_support_subscriber.rb
@@ -3,8 +3,10 @@ module Gitlab
class ActiveSupportSubscriber < ActiveSupport::Subscriber
attach_to :active_record
- def sql(*)
- Transaction.current&.increment
+ def sql(event)
+ unless event.payload[:name] == 'CACHE'
+ Transaction.current&.increment
+ end
end
end
end