killbill 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53241b3ff5ba7293ab885ae36942071b396cdb03
-  data.tar.gz: 6c78b3cb59a3c28140b30fdfbcc080425858f5ce
+  metadata.gz: aabe3a8f982505fbc0553841a657da0c8594ce57
+  data.tar.gz: 794bbb1623029efe0eb5689457b940703b1d4282
 SHA512:
-  metadata.gz: c131124735e38e0e61e7934190e36e661490df54d308d5bb8ffd74e743312b35e4561eec42f8bd9bd5df50a15e51746fd79966a72340e3ab93a680f24dfe74bf
-  data.tar.gz: 3e69182738dba3c38f5f012afc6846b9306454c4e97e5cb70c1ac1a6f60cfdf8fe26c4f518a4aaeaf6e416246fc40e5176442df08cddfb8c62fcf84f2f30f89a
+  metadata.gz: 8d3ffd5609c96255b83964709465f29b1a16619a4fa00c585ac3d1c4ad6000ab08448c608c2987de3871925900f0f65385c2f16f36affe07313611e9d5c64837
+  data.tar.gz: 6bfaf6c5de3339383920799042f9054215e33538ff08f02cf61d463fbc91ef66ad8b30b94efa386126c9f515e255b7ea83e07c3b4330ffd69eeada56cb08bafb

data/NEWS

@@ -1,3 +1,10 @@
+3.1.11
+    ActiveMerchant:
+      - add proxy support
+      - redirect wiredump device to Kill Bill log
+      - expose networking configuration options
+    ActiveRecord performance improvements
+
 3.1.10
     Add workarounds for ActiveRecord bugs under high load/concurrency
     BoundedLRUCache performance improvements

data/VERSION

@@ -1 +1 @@
-3.1.10
+3.1.11

data/lib/killbill/ext/active_merchant/jdbc_connection.rb

@@ -35,6 +35,29 @@ module ActiveRecord
       def self.jndi_retries(config)
         (config[:jndi_retries] || 5).to_i
       end
+
+      protected
+
+      def setup_jndi_factory
+        data_source = config[:data_source] || Java::JavaxNaming::InitialContext.new.lookup(config[:jndi].to_s)
+
+        @jndi                   = true
+        # Really slow under high load (see https://github.com/jruby/activerecord-jdbc-adapter/pull/588).
+        #self.connection_factory = JdbcConnectionFactory.impl { data_source.connection }
+        self.connection_factory = RubyJdbcConnectionFactory.new(data_source)
+      end
+
+      class RubyJdbcConnectionFactory
+        include JdbcConnectionFactory
+
+        def initialize(data_source)
+          @data_source = data_source
+        end
+
+        def new_connection
+          @data_source.connection
+        end
+      end
     end
   end
 end

data/lib/killbill/ext/active_merchant/proxy_support.rb

@@ -0,0 +1,58 @@
+require 'active_utils/common/posts_data'
+
+# Pass the proxy details to the connection object - see https://github.com/Shopify/active_utils/pull/44
+module ActiveMerchant #:nodoc:
+  module PostsData #:nodoc:
+
+    def self.included(base)
+      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
+
+      base.superclass_delegating_accessor :open_timeout
+      base.open_timeout = 60
+
+      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
+
+      base.superclass_delegating_accessor :proxy_address
+      base.superclass_delegating_accessor :proxy_port
+    end
+
+    def raw_ssl_request(method, endpoint, data, headers = {})
+      logger.warn "#{self.class} using ssl_strict=false, which is insecure" if logger unless ssl_strict
+
+      connection = new_connection(endpoint)
+      connection.open_timeout = open_timeout
+      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
+
+      connection.pem          = @options[:pem] if @options
+      connection.pem_password = @options[:pem_password] if @options
+
+      connection.ignore_http_status = @options[:ignore_http_status] if @options
+
+      connection.proxy_address = proxy_address
+      connection.proxy_port = proxy_port
+
+      connection.request(method, data, headers)
+    end
+  end
+end

data/lib/killbill/ext/active_merchant/typhoeus_connection.rb

@@ -16,9 +16,11 @@ module ActiveMerchant
 
           result   = nil
           realtime = Benchmark.realtime do
-            options        = {:method => method, :headers => headers}
-            options[:body] = body if body
-            result         = http(endpoint.to_s, options)
+            options         = {:method => method, :headers => headers, :connecttimeout => open_timeout}
+            options[:body]  = body if body
+            options[:proxy] = proxy_address if proxy_address
+            options[:proxy] += ":#{proxy_port}" if proxy_address and proxy_port
+            result          = http(endpoint.to_s, options)
           end
 
           debug '--> response_code=%d (body_length=%d total_time=%.4fs realtime=%.4fs)' % [result.code, result.body ? result.body.length : 0, result.total_time, realtime], tag

data/lib/killbill/helpers/active_merchant.rb

@@ -4,6 +4,7 @@ module Killbill
       require 'killbill'
 
       require 'killbill/ext/active_merchant/jdbc_connection'
+      require 'killbill/ext/active_merchant/proxy_support'
 
       require 'active_support/core_ext'
       require File.dirname(__FILE__) + '/active_merchant/core_ext.rb'

data/lib/killbill/helpers/active_merchant/gateway.rb

@@ -13,8 +13,20 @@ module Killbill
 
           if config[:log_file]
             ::ActiveMerchant::Billing::Gateway.wiredump_device = File.open(config[:log_file], 'w')
-            ::ActiveMerchant::Billing::Gateway.wiredump_device.sync = true
+          else
+            log_method = config[:quiet] ? :debug : :info
+            ::ActiveMerchant::Billing::Gateway.wiredump_device = ::Killbill::Plugin::ActiveMerchant::Utils::KBWiredumpDevice.new(logger, log_method)
           end
+          ::ActiveMerchant::Billing::Gateway.wiredump_device.sync = true
+
+          ::ActiveMerchant::Billing::Gateway.open_timeout  = config[:open_timeout] if config[:open_timeout]
+          ::ActiveMerchant::Billing::Gateway.read_timeout  = config[:read_timeout] if config[:read_timeout]
+          ::ActiveMerchant::Billing::Gateway.retry_safe    = config[:retry_safe] if config[:retry_safe]
+          ::ActiveMerchant::Billing::Gateway.ssl_strict    = config[:ssl_strict] if config[:ssl_strict]
+          ::ActiveMerchant::Billing::Gateway.ssl_version   = config[:ssl_version] if config[:ssl_version]
+          ::ActiveMerchant::Billing::Gateway.max_retries   = config[:max_retries] if config[:max_retries]
+          ::ActiveMerchant::Billing::Gateway.proxy_address = config[:proxy_address] if config[:proxy_address]
+          ::ActiveMerchant::Billing::Gateway.proxy_port    = config[:proxy_port] if config[:proxy_port]
 
           Gateway.new(config, gateway_builder.call(config))
         end

data/lib/killbill/helpers/active_merchant/payment_plugin.rb

@@ -18,6 +18,8 @@ module Killbill
         end
 
         def start_plugin
+          @logger.progname = "#{@identifier.to_s}-plugin"
+
           ::Killbill::Plugin::ActiveMerchant.initialize! @gateway_builder,
                                                          @identifier.to_sym,
                                                          @logger,

data/lib/killbill/helpers/active_merchant/utils.rb

@@ -17,6 +17,23 @@ module Killbill
           no_hyphens.insert(8, "-").insert(13, "-").insert(18, "-").insert(23, "-")
         end
 
+        class KBWiredumpDevice < IO
+
+          # Required for compatibility, but unused
+          attr_accessor :sync
+
+          def initialize(logger, method = :info)
+            @logger = logger
+            @method = method
+          end
+
+          # We mostly care about the << method
+          def write(string)
+            sanitized_string = string.to_s.chomp("\n")
+            @logger.send(@method, sanitized_string) if sanitized_string.size > 0
+          end
+        end
+
         # Relies on the fact that hashes enumerate their values in the order that the corresponding keys were inserted (Ruby 1.9+)
         class BoundedLRUCache
 

data/lib/killbill/killbill_logger.rb

@@ -6,6 +6,7 @@ module Killbill
     class KillbillLogger
 
       attr_accessor :log_level
+      attr_accessor :progname
 
       def initialize(delegate)
         @logger    = delegate
@@ -66,7 +67,8 @@ module Killbill
             message = '(nil)'
           end
         end
-        message.nil? ? '(nil)' : message.to_s
+        final_message = message.nil? ? '(nil)' : message.to_s
+        @progname ? "[#{@progname}] #{final_message}" : final_message
       end
 
       alias_method :fatal, :error

data/spec/killbill/helpers/utils_spec.rb

@@ -20,6 +20,22 @@ describe Killbill::Plugin::ActiveMerchant::Utils do
     end
   end
 
+  it 'should implement a wiredump device for the Kill Bill logger' do
+    logger       = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+
+    io      = ::Killbill::Plugin::ActiveMerchant::Utils::KBWiredumpDevice.new(logger)
+    io.sync = true
+    io.sync.should be_true
+    io << 'This is an I/O test'
+
+    jlogger  = ::Killbill::Plugin::KillbillLogger.new(logger)
+    jio      = ::Killbill::Plugin::ActiveMerchant::Utils::KBWiredumpDevice.new(jlogger)
+    jio.sync = true
+    jio.sync.should be_true
+    jio << 'This is an I/O test (via Java)'
+  end
+
   it 'should implement a thread-safe LRU cache' do
     require 'benchmark'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -256,6 +256,7 @@ files:
 - lib/killbill/creator.rb
 - lib/killbill/currency.rb
 - lib/killbill/ext/active_merchant/jdbc_connection.rb
+- lib/killbill/ext/active_merchant/proxy_support.rb
 - lib/killbill/ext/active_merchant/typhoeus_connection.rb
 - lib/killbill/gen/api/account.rb
 - lib/killbill/gen/api/account_api_exception.rb