diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-11 15:50:49 +0000 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-15 10:35:37 -0500 |
commit | 3ef2fb2b1b43b747b1ccf9ddd394171385774a50 (patch) | |
tree | 3ca9043a89b5d4e818b29de5cc60bcde2c2d1809 /app | |
parent | 85d38bcd78bcda04fb25672d7fc484f075860a33 (diff) | |
download | gitlab-ce-3ef2fb2b1b43b747b1ccf9ddd394171385774a50.tar.gz |
Merge branch 'broadcast-messages-cache' into 'master'
Better caching and indexing of broadcast messages
Closes #31706
See merge request !13429
Diffstat (limited to 'app')
-rw-r--r-- | app/models/broadcast_message.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb index 944725d91c3..3692bcc680d 100644 --- a/app/models/broadcast_message.rb +++ b/app/models/broadcast_message.rb @@ -14,9 +14,15 @@ class BroadcastMessage < ActiveRecord::Base default_value_for :color, '#E75E40' default_value_for :font, '#FFFFFF' + CACHE_KEY = 'broadcast_message_current'.freeze + + after_commit :flush_redis_cache + def self.current - Rails.cache.fetch("broadcast_message_current", expires_in: 1.minute) do - where('ends_at > :now AND starts_at <= :now', now: Time.zone.now).order([:created_at, :id]).to_a + Rails.cache.fetch(CACHE_KEY) do + where('ends_at > :now AND starts_at <= :now', now: Time.zone.now) + .reorder(id: :asc) + .to_a end end @@ -31,4 +37,8 @@ class BroadcastMessage < ActiveRecord::Base def ended? ends_at < Time.zone.now end + + def flush_redis_cache + Rails.cache.delete(CACHE_KEY) + end end |