fix: dont retrieve from store until accessing file

carrierwaveuploader · Sep 6, 2023 · 23c85c7 · 23c85c7
1 parent d973607
commit 23c85c7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/carrierwave/uploader/store.rb b/lib/carrierwave/uploader/store.rb
@@ -88,7 +88,7 @@ def store!(new_file=nil)
               cache_storage.delete_dir!(cache_path(nil))
             end
             @file = new_file
-            @identifier = storage.try(:identifier)
+            @identifier = storage.identifier
             @cache_id = @deduplication_index = nil
             @staged = false
           end
@@ -120,7 +120,7 @@ def file
       #
       def retrieve_from_store!(file_identifier)
         retrieval_retry_count ||= 0
-        # return if retrieval_retry_count > download_retry_count
+        return if retrieval_retry_count > download_retry_count
         retrieval_retry_count += 1
         with_callbacks(:retrieve_from_store, file_identifier) do
           # We can't retrieve the file if we have no identifier