Fix error when trying to delete already-deleted file with OpenStack Swift (#27569)

2023-10-26 15:09:48 +02:00 · 2023-10-26 15:09:48 +02:00 · de86e822f4
parent 4c38706474
commit de86e822f4
1 changed files with 6 additions and 1 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