GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 1ce0595b authored by Michael Kozono's avatar Michael Kozono

Backport: Propagate broadcast messages to secondaries

parent 37a56324
......@@ -19,7 +19,7 @@ class BroadcastMessage < ActiveRecord::Base
after_commit :flush_redis_cache
def self.current
messages = Rails.cache.fetch(CACHE_KEY) { current_and_future_messages.to_a }
messages = Rails.cache.fetch(CACHE_KEY, expires_in: cache_expires_in) { current_and_future_messages.to_a }
return messages if messages.empty?
......@@ -36,6 +36,10 @@ def self.current_and_future_messages
where('ends_at > :now', now: Time.zone.now).order_id_asc
end
def self.cache_expires_in
nil
end
def active?
started? && !ended?
end
......
......@@ -51,7 +51,11 @@
expect(described_class).to receive(:where).and_call_original.once
2.times { described_class.current }
described_class.current
Timecop.travel(1.year) do
described_class.current
end
end
it 'includes messages that need to be displayed in the future' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment