active_utils 1.0.5 → 2.0.0

data/lib/active_utils/common/connection.rb

@@ -11,6 +11,8 @@ module ActiveMerchant
     OPEN_TIMEOUT = 60
     READ_TIMEOUT = 60
     VERIFY_PEER = true
+    CA_FILE = (File.dirname(__FILE__) + '/../../certs/cacert.pem')
+    CA_PATH = nil
     RETRY_SAFE = false
     RUBY_184_POST_HEADERS = { "Content-Type" => "application/x-www-form-urlencoded" }
 
@@ -18,12 +20,17 @@ module ActiveMerchant
     attr_accessor :open_timeout
     attr_accessor :read_timeout
     attr_accessor :verify_peer
+    attr_accessor :ssl_version
+    attr_accessor :ca_file
+    attr_accessor :ca_path
+    attr_accessor :retry_safe
     attr_accessor :pem
     attr_accessor :pem_password
     attr_accessor :wiredump_device
     attr_accessor :logger
     attr_accessor :tag
     attr_accessor :ignore_http_status
+    attr_accessor :max_retries
 
     def initialize(endpoint)
       @endpoint     = endpoint.is_a?(URI) ? endpoint : URI.parse(endpoint)
@@ -31,13 +38,19 @@ module ActiveMerchant
       @read_timeout = READ_TIMEOUT
       @retry_safe   = RETRY_SAFE
       @verify_peer  = VERIFY_PEER
+      @ca_file      = CA_FILE
+      @ca_path      = CA_PATH
+      @max_retries  = MAX_RETRIES
       @ignore_http_status = false
+      @ssl_version = nil
     end
 
     def request(method, body, headers = {})
-      retry_exceptions(:max_retries => MAX_RETRIES, :logger => logger, :tag => tag) do
+      request_start = Time.now.to_f
+
+      retry_exceptions(:max_retries => max_retries, :logger => logger, :tag => tag) do
         begin
-          info "#{method.to_s.upcase} #{endpoint}", tag
+          info "connection_http_method=#{method.to_s.upcase} connection_uri=#{endpoint}", tag
 
           result = nil
 
@@ -68,6 +81,9 @@ module ActiveMerchant
           result
         end
       end
+
+    ensure
+      info "connection_request_total_time=%.4fs" % [Time.now.to_f - request_start], tag
     end
 
     private
@@ -93,13 +109,16 @@ module ActiveMerchant
       return unless endpoint.scheme == "https"
 
       http.use_ssl = true
+      http.ssl_version = ssl_version if ssl_version
 
       if verify_peer
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        http.ca_file     = File.dirname(__FILE__) + '/../../certs/cacert.pem'
+        http.ca_file     = ca_file
+        http.ca_path     = ca_path
       else
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
+
     end
 
     def configure_cert(http)

data/lib/active_utils/common/network_connection_retries.rb

@@ -32,19 +32,25 @@ module ActiveMerchant
     private
 
     def retry_network_exceptions(options = {})
-      retries = options[:max] || DEFAULT_RETRIES
+      initial_retries = options[:max_retries] || DEFAULT_RETRIES
+      retries = initial_retries
+      request_start = nil
 
       begin
-        yield
+        request_start = Time.now.to_f
+        result = yield
+        log_with_retry_details(options[:logger], initial_retries-retries + 1, Time.now.to_f - request_start, "success", options[:tag])
+        result
       rescue ActiveMerchant::RetriableConnectionError => e
         retries -= 1
+
+        log_with_retry_details(options[:logger], initial_retries-retries, Time.now.to_f - request_start, e.message, options[:tag])
         retry unless retries.zero?
-        NetworkConnectionRetries.log(options[:logger], :error, e.message, options[:tag])
         raise ActiveMerchant::ConnectionError, e.message
       rescue ActiveMerchant::ConnectionError => e
         retries -= 1
+        log_with_retry_details(options[:logger], initial_retries-retries, Time.now.to_f - request_start, e.message, options[:tag])
         retry if (options[:retry_safe] || retry_safe) && !retries.zero?
-        NetworkConnectionRetries.log(options[:logger], :error, e.message, options[:tag])
         raise
       end
     end
@@ -54,5 +60,10 @@ module ActiveMerchant
       message = "[#{tag}] #{message}"
       logger.send(level, message) if logger
     end
+
+    private
+    def log_with_retry_details(logger, attempts, time, message, tag)
+      NetworkConnectionRetries.log(logger, :info, "connection_attempt=%d connection_request_time=%.4fs connection_msg=\"%s\"" % [attempts, time, message], tag)
+    end
   end
 end

data/lib/active_utils/common/posts_data.rb

@@ -5,6 +5,9 @@ module ActiveMerchant #:nodoc:
       base.superclass_delegating_accessor :ssl_strict
       base.ssl_strict = true
 
+      base.superclass_delegating_accessor :ssl_version
+      base.ssl_version = nil
+
       base.class_attribute :retry_safe
       base.retry_safe = false
 
@@ -14,6 +17,9 @@ module ActiveMerchant #:nodoc:
       base.superclass_delegating_accessor :read_timeout
       base.read_timeout = 60
 
+      base.superclass_delegating_accessor :max_retries
+      base.max_retries = Connection::MAX_RETRIES
+
       base.superclass_delegating_accessor :logger
       base.superclass_delegating_accessor :wiredump_device
     end
@@ -38,7 +44,9 @@ module ActiveMerchant #:nodoc:
       connection.read_timeout = read_timeout
       connection.retry_safe   = retry_safe
       connection.verify_peer  = ssl_strict
+      connection.ssl_version  = ssl_version
       connection.logger       = logger
+      connection.max_retries  = max_retries
       connection.tag          = self.class.name
       connection.wiredump_device = wiredump_device
 

data/lib/active_utils/version.rb

@@ -1,3 +1,3 @@
 module ActiveUtils
-  VERSION = "1.0.5"
+  VERSION = "2.0.0"
 end