From 6acf2fa363cee293286578b83646af4015a140df Mon Sep 17 00:00:00 2001 From: Cameron Bothner Date: Mon, 20 Aug 2018 17:35:36 -0400 Subject: Handle only specifically relevant Azure HTTPErrors The Azure gem uses `Azure::Core::Http::HTTPError` for everything: checksum mismatch, missing object, network unavailable, and many more. (https://www.rubydoc.info/github/yaxia/azure-storage-ruby/Azure/Core/Http/HTTPError). Rescuing that class obscures all sorts of configuration errors. We should check the type of error in those rescue blocks, and reraise when needed. --- .../active_storage/service/azure_storage_service.rb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'activestorage/lib') diff --git a/activestorage/lib/active_storage/service/azure_storage_service.rb b/activestorage/lib/active_storage/service/azure_storage_service.rb index 66aabc1f9f..4fde35bdeb 100644 --- a/activestorage/lib/active_storage/service/azure_storage_service.rb +++ b/activestorage/lib/active_storage/service/azure_storage_service.rb @@ -19,10 +19,8 @@ module ActiveStorage def upload(key, io, checksum: nil) instrument :upload, key: key, checksum: checksum do - begin + handle_errors do 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 @@ -55,7 +53,8 @@ module ActiveStorage instrument :delete, key: key do begin blobs.delete_blob(container, key) - rescue Azure::Core::Http::HTTPError + rescue Azure::Core::Http::HTTPError => e + raise unless e.type == "BlobNotFound" # Ignore files already deleted end end @@ -128,8 +127,12 @@ module ActiveStorage def blob_for(key) blobs.get_blob_properties(container, key) - rescue Azure::Core::Http::HTTPError - false + rescue Azure::Core::Http::HTTPError => e + if e.type == "BlobNotFound" + false + else + raise + end end def format_expiry(expires_in) @@ -155,8 +158,11 @@ module ActiveStorage def handle_errors yield rescue Azure::Core::Http::HTTPError => e - if e.type == "BlobNotFound" + case e.type + when "BlobNotFound" raise ActiveStorage::FileNotFoundError + when "Md5Mismatch" + raise ActiveStorage::IntegrityError else raise end -- cgit v1.2.3