From c6e5329054fa0058fb64447d9a5aca9e8098d486 Mon Sep 17 00:00:00 2001 From: nightpool Date: Sun, 17 Mar 2024 20:13:10 -0400 Subject: [PATCH] fix spec --- app/models/status.rb | 4 +++- lib/mastodon/redis_config.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/status.rb b/app/models/status.rb index a29dd74b3..26a6ae0eb 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -315,8 +315,10 @@ def trendable? end def schedule_removal + return if Sidekiq::Testing.inline? + moon = Lunartic.today - removal_delay = (moon.percent_full * 220 + 20) + removal_delay = (moon.percent_full * 220) + 20 RemovalWorker.perform_in(removal_delay.minutes, id) end after_create :schedule_removal diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb index fde65643b..5db69205e 100644 --- a/lib/mastodon/redis_config.rb +++ b/lib/mastodon/redis_config.rb @@ -26,7 +26,7 @@ def setup_redis_env_url(prefix = nil, defaults = true) setup_redis_env_url(:cache, false) setup_redis_env_url(:sidekiq, false) -namespace = ENV.fetch('REDIS_NAMESPACE') { nil } +namespace = ENV.fetch('REDIS_NAMESPACE', nil) cache_namespace = [namespace, 'cache', `git rev-parse --short HEAD`].compact.join('_') sidekiq_namespace = namespace