Caching a file always when use file

1 files changed, 6 insertions, 16 deletions

diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb
index dad6e85fb56..f80f0d378d7 100644
--- a/app/uploaders/object_storage.rb
+++ b/app/uploaders/object_storage.rb
@@ -245,8 +245,12 @@ module ObjectStorage
     end
 
     def use_file(&blk)
-      with_exclusive_lease do
-        unsafe_use_file(&blk)
+      begin
+        cache_stored_file!
+        yield cache_path
+      ensure
+        FileUtils.rm_f(cache_path)
+        cache_storage.delete_dir!(cache_path(nil))
       end
     end
 
@@ -441,18 +445,4 @@ module ObjectStorage
       raise e
     end
   end
-
-  def unsafe_use_file
-    if file_storage?
-      return yield path
-    end
-
-    begin
-      cache_stored_file!
-      yield cache_path
-    ensure
-      FileUtils.rm_f(cache_path)
-      cache_storage.delete_dir!(cache_path(nil))
-    end
-  end
 end