diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /lib/gitlab/query_limiting | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'lib/gitlab/query_limiting')
-rw-r--r-- | lib/gitlab/query_limiting/transaction.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/gitlab/query_limiting/transaction.rb b/lib/gitlab/query_limiting/transaction.rb index 196072dddda..643b2540c37 100644 --- a/lib/gitlab/query_limiting/transaction.rb +++ b/lib/gitlab/query_limiting/transaction.rb @@ -5,7 +5,7 @@ module Gitlab class Transaction THREAD_KEY = :__gitlab_query_counts_transaction - attr_accessor :count, :whitelisted + attr_accessor :count # The name of the action (e.g. `UsersController#show`) that is being # executed. @@ -45,7 +45,6 @@ module Gitlab def initialize @action = nil @count = 0 - @whitelisted = false @sql_executed = [] end @@ -59,7 +58,7 @@ module Gitlab end def increment - @count += 1 unless whitelisted + @count += 1 if enabled? end def executed_sql(sql) @@ -83,6 +82,10 @@ module Gitlab ["#{header}: #{msg}", log, ellipsis].compact.join("\n") end + + def enabled? + ::Gitlab::QueryLimiting.enabled? + end end end end |