Merge branch 'cache-broadcast-message-current' into 'master'

Cache BroadcastMessage.current. Fixes #12770 See merge request !2633

Merge branch 'cache-broadcast-message-current' into 'master'
55c4996b · Dmitriy Zaporozhets · f862b4ae · a6d6cfaf · 55c4996b
Commit 55c4996b authored Jan 30, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

broadcast_message.rb app/models/broadcast_message.rb +3 -1

No files found.
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -26,7 +26,9 @@ class BroadcastMessage < ActiveRecord::Base
  default_value_for :font,  '#FFFFFF'

  def self.current
-    where("ends_at > :now AND starts_at <= :now", now: Time.zone.now).last
+    Rails.cache.fetch("broadcast_message_current", expires_in: 1.minute) do
+      where("ends_at > :now AND starts_at <= :now", now: Time.zone.now).last
+    end
  end

  def active?