diff options
Diffstat (limited to 'activestorage/lib')
| -rw-r--r-- | activestorage/lib/active_storage/service/azure_storage_service.rb | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/activestorage/lib/active_storage/service/azure_storage_service.rb b/activestorage/lib/active_storage/service/azure_storage_service.rb index 4fde35bdeb..66aabc1f9f 100644 --- a/activestorage/lib/active_storage/service/azure_storage_service.rb +++ b/activestorage/lib/active_storage/service/azure_storage_service.rb @@ -19,8 +19,10 @@ module ActiveStorage def upload(key, io, checksum: nil) instrument :upload, key: key, checksum: checksum do - handle_errors do + begin blobs.create_block_blob(container, key, IO.try_convert(io) || io, content_md5: checksum) + rescue Azure::Core::Http::HTTPError + raise ActiveStorage::IntegrityError end end end @@ -53,8 +55,7 @@ module ActiveStorage instrument :delete, key: key do begin blobs.delete_blob(container, key) - rescue Azure::Core::Http::HTTPError => e - raise unless e.type == "BlobNotFound" + rescue Azure::Core::Http::HTTPError # Ignore files already deleted end end @@ -127,12 +128,8 @@ module ActiveStorage def blob_for(key) blobs.get_blob_properties(container, key) - rescue Azure::Core::Http::HTTPError => e - if e.type == "BlobNotFound" - false - else - raise - end + rescue Azure::Core::Http::HTTPError + false end def format_expiry(expires_in) @@ -158,11 +155,8 @@ module ActiveStorage def handle_errors yield rescue Azure::Core::Http::HTTPError => e - case e.type - when "BlobNotFound" + if e.type == "BlobNotFound" raise ActiveStorage::FileNotFoundError - when "Md5Mismatch" - raise ActiveStorage::IntegrityError else raise end |