Ensure result file is deleted on uploading errors

razum2um · Apr 22, 2018 · 0d811fd · 0d811fd
1 parent f01e249
commit 0d811fd
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/activestorage/app/models/active_storage/variant.rb b/activestorage/app/models/active_storage/variant.rb
@@ -100,9 +100,9 @@ def processed?
 
     def process
       download_blob_to_tempfile do |image|
-        variant = transform image
-        upload variant
-        variant.close!
+        transform image do |output|
+          upload output
+        end
       end
     end
 
@@ -121,7 +121,13 @@ def content_type
 
     def transform(image)
       format = "png" unless WEB_IMAGE_CONTENT_TYPES.include?(blob.content_type)
-      variation.transform(image, format: format)
+      result = variation.transform(image, format: format)
+
+      begin
+        yield result
+      ensure
+        result.close!
+      end
     end
 
     def upload(file)