Fix error when trying to delete already-deleted file with OpenStack S…

…wift Fixes #27568
mastodon · Oct 26, 2023 · e785c4b · e785c4b
1 parent 9a3d047
commit e785c4b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/lib/attachment_batch.rb b/app/lib/attachment_batch.rb
@@ -75,7 +75,12 @@ def remove_files
             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