Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Increase HTTP read timeout for expensive S3 batch delete operation (#36971)" (#36996)

Browse Source
This commit is contained in:
Claire
2025-11-24 14:33:37 +01:00
committed by GitHub
parent 57bfe863f3
commit 96d5e57351
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/lib/attachment_batch.rb
View File

@@ -112,17 +112,10 @@ class AttachmentBatch
keys.each_slice(LIMIT) do |keys_slice| keys.each_slice(LIMIT) do |keys_slice|
logger.debug { "Deleting #{keys_slice.size} objects" } logger.debug { "Deleting #{keys_slice.size} objects" }
bucket.delete_objects( bucket.delete_objects(delete: {
{ objects: keys_slice.map { |key| { key: key } },
delete: { quiet: true,
objects: keys_slice.map { |key| { key: key } }, })
quiet: true,
},
},
{
http_read_timeout: [Paperclip::Attachment.default_options[:s3_options][:http_read_timeout], 120].max,
}
)
rescue => e rescue => e
retries += 1 retries += 1