From 03d9618595bd2433a319c0bfc0f5bbb14653d0d6 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 1 Nov 2022 12:59:23 +0100 Subject: Fix UserCleanupScheduler crash when an unconfirmed account has a moderation note (#19629) Fixes #19109 --- app/workers/scheduler/user_cleanup_scheduler.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/workers/scheduler') diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb index d1f00c47f..7a6995a1f 100644 --- a/app/workers/scheduler/user_cleanup_scheduler.rb +++ b/app/workers/scheduler/user_cleanup_scheduler.rb @@ -15,6 +15,8 @@ class Scheduler::UserCleanupScheduler def clean_unconfirmed_accounts! User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).reorder(nil).find_in_batches do |batch| + # We have to do it separately because of missing database constraints + AccountModerationNote.where(account_id: batch.map(&:account_id)).delete_all Account.where(id: batch.map(&:account_id)).delete_all User.where(id: batch.map(&:id)).delete_all end -- cgit From d0c9ac39190c71afb581836e770ebace4ad1ef1b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 5 Nov 2022 22:31:52 +0100 Subject: Fix indexing scheduler trying to index when Elasticsearch is disabled (#19805) Fix #19646 --- app/workers/scheduler/indexing_scheduler.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/workers/scheduler') diff --git a/app/workers/scheduler/indexing_scheduler.rb b/app/workers/scheduler/indexing_scheduler.rb index 3a6f47a29..c42396629 100644 --- a/app/workers/scheduler/indexing_scheduler.rb +++ b/app/workers/scheduler/indexing_scheduler.rb @@ -7,6 +7,8 @@ class Scheduler::IndexingScheduler sidekiq_options retry: 0 def perform + return unless Chewy.enabled? + indexes.each do |type| with_redis do |redis| ids = redis.smembers("chewy:queue:#{type.name}") -- cgit