diff options
Diffstat (limited to 'lib/active_storage/service/gcs_service.rb')
-rw-r--r-- | lib/active_storage/service/gcs_service.rb | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/lib/active_storage/service/gcs_service.rb b/lib/active_storage/service/gcs_service.rb index e09fa484ff..bca4ab5331 100644 --- a/lib/active_storage/service/gcs_service.rb +++ b/lib/active_storage/service/gcs_service.rb @@ -10,29 +10,47 @@ class ActiveStorage::Service::GCSService < ActiveStorage::Service end def upload(key, io, checksum: nil) - bucket.create_file(io, key, md5: checksum) - rescue Google::Cloud::InvalidArgumentError - raise ActiveStorage::IntegrityError + instrument :upload, key, checksum: checksum do + begin + bucket.create_file(io, key, md5: checksum) + rescue Google::Cloud::InvalidArgumentError + raise ActiveStorage::IntegrityError + end + end end # FIXME: Add streaming when given a block def download(key) - io = file_for(key).download - io.rewind - io.read + instrument :download, key do + io = file_for(key).download + io.rewind + io.read + end end def delete(key) - file_for(key)&.delete + instrument :delete, key do + file_for(key)&.delete + end end def exist?(key) - file_for(key).present? + instrument :exist, key do |payload| + answer = file_for(key).present? + payload[:exist] = answer + answer + end end def url(key, expires_in:, disposition:, filename:) - file_for(key).signed_url(expires: expires_in) + "&" + - { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }.to_query + instrument :url, key do |payload| + generated_url = file_for(key).signed_url(expires: expires_in) + "&" + + { "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"" }.to_query + + payload[:url] = generated_url + + generated_url + end end private |