Merge remote-tracking branch 'parent/main' into upstream-20231027

2023-10-27 08:35:05 +09:00 · 2023-10-27 08:35:05 +09:00 · 26ecad7067
commit 26ecad7067
parent 1d8862712a 12550a6a28
53 changed files with 397 additions and 294 deletions
--- a/app/lib/attachment_batch.rb
+++ b/app/lib/attachment_batch.rb
@ -75,7 +75,12 @@ class AttachmentBatch
            end
          when :fog
            logger.debug { "Deleting #{attachment.path(style)}" }
-            attachment.send(:directory).files.new(key: attachment.path(style)).destroy
+
+            begin
+              attachment.send(:directory).files.new(key: attachment.path(style)).destroy
+            rescue Fog::Storage::OpenStack::NotFound
+              # Ignore failure to delete a file that has already been deleted
+            end
          when :azure
            logger.debug { "Deleting #{attachment.path(style)}" }
            attachment.destroy