diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-17 12:27:12 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-17 12:27:12 +0000 |
| commit | c64fd519e58d5605d43baca11a892028c4390c61 (patch) | |
| tree | 056912082a4c0377b20c9830d3f05915e7417820 | |
| parent | 15fda22c5c968b01c824b8f1e979c4fa47f17edc (diff) | |
| parent | 7cbdaef4526ae9586123eee1afdbc64bc733244d (diff) | |
| download | gitlab-ce-c64fd519e58d5605d43baca11a892028c4390c61.tar.gz | |
Merge branch 'fix-performance-bar-cached-user-ids' into 'master'
Expire cached user IDs that can see the performance after 5 minutes
See merge request !12911
| -rw-r--r-- | lib/gitlab/performance_bar.rb | 5 |
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 |