Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream

2025-12-13 15:58:50 +00:00 · 2025-11-21 19:33:14 +01:00
parent 2f2065751d 585545d0d5
commit 652ed7ab50
58 changed files with 744 additions and 276 deletions
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@@ -112,10 +112,17 @@ class AttachmentBatch
    keys.each_slice(LIMIT) do |keys_slice|
      logger.debug { "Deleting #{keys_slice.size} objects" }

-      bucket.delete_objects(delete: {
-        objects: keys_slice.map { |key| { key: key } },
-        quiet: true,
-      })
+      bucket.delete_objects(
+        {
+          delete: {
+            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
      retries += 1