From 2e216dd43bb02d741b2fcbfc1fe40042ad85a590 Mon Sep 17 00:00:00 2001
From: Dylan Griffith <dyl.griffith@gmail.com>
Date: Wed, 21 Feb 2018 16:27:05 +1100
Subject: Do not count rails sql cache as queries in query limiting

---
 lib/gitlab/query_limiting/active_support_subscriber.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib')

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
-- 
cgit v1.2.1