require 'google/api_client/batch'
require 'google/api_client/gzip'
require 'google/api_client/client_secrets'
-require 'google/api_client/railtie' if defined?(Rails::Railtie)
+require 'google/api_client/railtie' if defined?(Rails)
module Google
faraday.ssl.ca_file = ca_file
faraday.ssl.verify = true
faraday.adapter Faraday.default_adapter
- end
+ end
return self
end
connection = options[:connection] || self.connection
request.authorization = options[:authorization] || self.authorization unless options[:authenticated] == false
+
tries = 1 + (options[:retries] || self.retries)
+
Retriable.retriable :tries => tries,
- :on => [TransmissionError],
+ :on => [TransmissionError],
+ :on_retry => client_error_handler(request.authorization),
:interval => lambda {|attempts| (2 ** attempts) + rand} do
result = request.send(connection, true)
}))
raise RedirectError.new(result.headers['location'], result)
when 400...500
- if result.status == 401 && request.authorization.respond_to?(:refresh_token) && auto_refresh_token
- begin
- logger.debug("Attempting refresh of access token & retry of request")
- request.authorization.fetch_access_token!
- rescue Signet::AuthorizationError
- # Ignore since we want the original error
- end
- end
raise ClientError.new(result.error_message || "A client error has occurred", result)
when 500...600
raise ServerError.new(result.error_message || "A server error has occurred", result)
return Addressable::Template.new(@base_uri + template).expand(mapping)
end
- end
-end
+ ##
+ # Returns on proc for special processing of retries as not all client errors
+ # are recoverable. Only 401s should be retried and only if the credentials
+ # are refreshable
+ #
+ # @param [#fetch_access_token!] authorization
+ # OAuth 2 credentials
+ # @return [Proc]
+ def client_error_handler(authorization)
+ can_refresh = authorization.respond_to?(:refresh_token) && auto_refresh_token
+ Proc.new do |exception, tries|
+ next unless exception.kind_of?(ClientError)
+ if exception.result.status == 401 && can_refresh && tries == 1
+ begin
+ logger.debug("Attempting refresh of access token & retry of request")
+ authorization.fetch_access_token!
+ next
+ rescue Signet::AuthorizationError
+ end
+ end
+ raise exception
+ end
+ end
-require 'google/api_client/version'
+ end
+
+end
\ No newline at end of file