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

[rackspace] fix JSON error parsing

Browse source 
Prevent an error in extracting the error message from the JSON response
from discarding the successfully parsed JSON response body.

For example, the parsed error response body from a failed PUT request to
store a SLO manifest object would be:
  { 'Errors' => [['path', 'error'], ['path', 'error']] }
This commit is contained in:
Brian D. Burns 2013-07-02 18:21:32 -04:00
parent e6ce26742f
commit d713739d97
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/fog/rackspace.rb
View file

@ -28,7 +28,7 @@ module Fog
unless error.response.body.empty?
begin
data = Fog::JSON.decode(error.response.body)
message = data.values.first ? data.values.first['message'] : data['message']
message = extract_message(data)
rescue => e
Fog::Logger.warning("Received exception '#{e}' while decoding>> #{error.response.body}")
message = error.response.body
@ -42,6 +42,16 @@ module Fog
new_error.instance_variable_set(:@status_code, status_code)
new_error
end
private
def self.extract_message(data)
if data.is_a?(Hash)
message = data.values.first['message'] if data.values.first.is_a?(Hash)
message ||= data['message']
end
message || data.inspect
end
end
class InternalServerError < ServiceError; end