kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Fix for Fog::HP::CDN::NotFound exception.

Browse source
This commit is contained in:
Rupak Ganguly 2012-02-15 00:40:23 -05:00
parent f10a3488f2
commit 415e05b2d7
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/hp/cdn.rb
View file

@ -118,7 +118,7 @@ module Fog
rescue Excon::Errors::HTTPStatusError => error
raise case error
when Excon::Errors::NotFound
Fog::Storage::HP::NotFound.slurp(error)
Fog::CDN::HP::NotFound.slurp(error)
else
error
end

14
lib/fog/hp/models/storage/directory.rb
View file

@ -28,7 +28,11 @@ module Fog
connection.delete_container(key)
# If CDN service is available, try to delete the container if it was CDN-enabled
if cdn_enabled?
connection.cdn.delete_container(key)
begin
connection.cdn.delete_container(key)
rescue Fog::CDN::HP::NotFound
# ignore if cdn container not found
end
end
true
rescue Excon::Errors::NotFound, Fog::Storage::HP::NotFound
@ -92,7 +96,7 @@ module Fog
else
@cdn_enable = false
end
rescue Fog::Storage::HP::NotFound => err
rescue Fog::CDN::HP::NotFound => err
@cdn_enable = false
end
else
@ -112,7 +116,7 @@ module Fog
response.headers.fetch('X-Cdn-Uri', nil)
end
end
rescue Fog::Storage::HP::NotFound => err
rescue Fog::CDN::HP::NotFound => err
nil
end
end
@ -133,7 +137,7 @@ module Fog
begin response = connection.cdn.head_container(key)
### Deleting a container from CDN is much more expensive than flipping the bit to disable it
connection.cdn.post_container(key, {'X-CDN-Enabled' => 'True'})
rescue Fog::Storage::HP::NotFound => err
rescue Fog::CDN::HP::NotFound => err
connection.cdn.put_container(key)
end
else
@ -141,7 +145,7 @@ module Fog
begin response = connection.cdn.head_container(key)
### Deleting a container from CDN is much more expensive than flipping the bit to disable it
connection.cdn.post_container(key, {'X-CDN-Enabled' => 'False'})
rescue Fog::Storage::HP::NotFound => err
rescue Fog::CDN::HP::NotFound => err
# just continue, as container is not cdn-enabled.
end
end