diff options
| author | Starfall <us@starfall.systems> | 2022-04-08 01:23:41 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-08 01:23:41 -0500 |
| commit | 8da73d2e57284c765b232bfc6842a7ac0f0a702b (patch) | |
| tree | 8f04f4d701e86d4ddadbdd6054171ed374523a7d /lib/paperclip | |
| parent | f7491de676298b8f78084c00f0026f8cf36d92fc (diff) | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'lib/paperclip')
| -rw-r--r-- | lib/paperclip/storage_extensions.rb | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/lib/paperclip/storage_extensions.rb b/lib/paperclip/storage_extensions.rb deleted file mode 100644 index 95c35641e..000000000 --- a/lib/paperclip/storage_extensions.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -# Some S3-compatible providers might not actually be compatible with some APIs -# used by kt-paperclip, see https://github.com/mastodon/mastodon/issues/16822 -if ENV['S3_ENABLED'] == 'true' && ENV['S3_FORCE_SINGLE_REQUEST'] == 'true' - module Paperclip - module Storage - module S3Extensions - def copy_to_local_file(style, local_dest_path) - log("copying #{path(style)} to local file #{local_dest_path}") - s3_object(style).download_file(local_dest_path, { mode: 'single_request' }) - rescue Aws::Errors::ServiceError => e - warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}") - false - end - end - end - end - - Paperclip::Storage::S3.prepend(Paperclip::Storage::S3Extensions) -end |