gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-12-17 09:33:16 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix vacuums being interrupted by a single batch failure (#36606)

Browse Source
This commit is contained in:
Eugen Rochko 2025-10-27 15:22:54 +01:00 committed by GitHub
parent b60bae6361
commit bfcf21e915
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/vacuum/media_attachments_vacuum.rb
View File

@ -17,12 +17,16 @@ class Vacuum::MediaAttachmentsVacuum
def vacuum_cached_files!
media_attachments_past_retention_period.find_in_batches do |media_attachments|
AttachmentBatch.new(MediaAttachment, media_attachments).clear
rescue => e
Rails.logger.error("Skipping batch while removing cached media attachments due to error: #{e}")
end
end
def vacuum_orphaned_records!
orphaned_media_attachments.find_in_batches do |media_attachments|
AttachmentBatch.new(MediaAttachment, media_attachments).delete
rescue => e
Rails.logger.error("Skipping batch while removing orphaned media attachments due to error: #{e}")
end
end

2
app/lib/vacuum/preview_cards_vacuum.rb
View File

@ -16,6 +16,8 @@ class Vacuum::PreviewCardsVacuum
def vacuum_cached_images!
preview_cards_past_retention_period.find_in_batches do |preview_card|
AttachmentBatch.new(PreviewCard, preview_card).clear
rescue => e
Rails.logger.error("Skipping batch while removing cached preview cards due to error: #{e}")
end
end