lib/ace-client/base.rb in ace-client-0.0.13 vs lib/ace-client/base.rb in ace-client-0.0.14

- old
+ new

@@ -21,9 +21,12 @@ @secret_access_key = options[:secret_access_key] || ENV['ACE_SECRET_ACCESS_KEY'] @endpoint = options[:endpoint] || ENV['ACE_ENDPOINT'] @http_proxy = options[:http_proxy] || ENV['HTTP_PROXY'] @http_method = options[:http_method] || :post @access_key_id_key = options[:access_key_id_key] || ENV['ACE_ACCESS_KEY_ID_KEY'] || 'AWSAccessKeyId' + if @timeout = options[:timeout] || ENV['ACE_TIMEOUT'] + self.class.default_timeout @timeout + end if options.key?(:use_ssl) @use_ssl = options[:use_ssl] elsif ENV['ACE_USE_SSL'] if ENV['ACE_USE_SSL'] == 'false' @use_ssl = false