summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-17 13:28:51 +0200
committerRémy Coutable <remy@rymai.me>2017-07-17 13:29:33 +0200
commit7cbdaef4526ae9586123eee1afdbc64bc733244d (patch)
tree3e7cd258eb1b22397cb242e52f88819ea6aefa25
parent8b31ecd3d94444df21483341fcbaa9bba6caba6d (diff)
downloadgitlab-ce-7cbdaef4526ae9586123eee1afdbc64bc733244d.tar.gz
Expire cached user IDs that can see the performance after 5 minutes
If we don't expire the cached user IDs, the list of IDs would become outdated when a new member is added, or when a member ios removed from the allowed group. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--lib/gitlab/performance_bar.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/performance_bar.rb b/lib/gitlab/performance_bar.rb
index 2da2ce45ebc..56112ec2301 100644
--- a/lib/gitlab/performance_bar.rb
+++ b/lib/gitlab/performance_bar.rb
@@ -2,7 +2,8 @@ module Gitlab
module PerformanceBar
include Gitlab::CurrentSettings
- ALLOWED_USER_IDS_KEY = 'performance_bar_allowed_user_ids'.freeze
+ ALLOWED_USER_IDS_KEY = 'performance_bar_allowed_user_ids:v2'.freeze
+ EXPIRY_TIME = 5.minutes
def self.enabled?(user = nil)
return false unless user && allowed_group_id
@@ -15,7 +16,7 @@ module Gitlab
end
def self.allowed_user_ids
- Rails.cache.fetch(ALLOWED_USER_IDS_KEY) do
+ Rails.cache.fetch(ALLOWED_USER_IDS_KEY, expires_in: EXPIRY_TIME) do
group = Group.find_by_id(allowed_group_id)
if group