killbill 3.2.4 → 4.0.0

data/lib/killbill/gen/api/tiered_block.rb

@@ -41,7 +41,7 @@ module Killbill
 
         def to_java()
           # conversion for type [type = org.killbill.billing.catalog.api.BlockType]
-          @type = Java::org.killbill.billing.catalog.api.BlockType.value_of("#{@type.to_s}") unless @type.nil?
+          @type = Java::org.killbill.billing.catalog.api.BlockType.value_of( @type.to_s ) unless @type.nil?
 
           # conversion for unit [type = org.killbill.billing.catalog.api.Unit]
           @unit = @unit.to_java unless @unit.nil?

data/lib/killbill/gen/api/usage.rb

@@ -44,13 +44,13 @@ module Killbill
           @name = @name.to_s unless @name.nil?
 
           # conversion for billing_mode [type = org.killbill.billing.catalog.api.BillingMode]
-          @billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of("#{@billing_mode.to_s}") unless @billing_mode.nil?
+          @billing_mode = Java::org.killbill.billing.catalog.api.BillingMode.value_of( @billing_mode.to_s ) unless @billing_mode.nil?
 
           # conversion for usage_type [type = org.killbill.billing.catalog.api.UsageType]
-          @usage_type = Java::org.killbill.billing.catalog.api.UsageType.value_of("#{@usage_type.to_s}") unless @usage_type.nil?
+          @usage_type = Java::org.killbill.billing.catalog.api.UsageType.value_of( @usage_type.to_s ) unless @usage_type.nil?
 
           # conversion for billing_period [type = org.killbill.billing.catalog.api.BillingPeriod]
-          @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of("#{@billing_period.to_s}") unless @billing_period.nil?
+          @billing_period = Java::org.killbill.billing.catalog.api.BillingPeriod.value_of( @billing_period.to_s ) unless @billing_period.nil?
 
           # conversion for limits [type = org.killbill.billing.catalog.api.Limit[]]
           tmp = java.util.ArrayList.new

data/lib/killbill/gen/plugin-api/currency_plugin_api.rb

@@ -48,7 +48,7 @@ module Killbill
           tmp = java.util.TreeSet.new
           (res || []).each do |m|
             # conversion for m [type = org.killbill.billing.catalog.api.Currency]
-            m = Java::org.killbill.billing.catalog.api.Currency.value_of("#{m.to_s}") unless m.nil?
+            m = Java::org.killbill.billing.catalog.api.Currency.value_of( m.to_s ) unless m.nil?
             tmp.add(m)
           end
           res = tmp

data/lib/killbill/gen/plugin-api/ext_bus_event.rb

@@ -41,10 +41,10 @@ module Killbill
 
         def to_java()
           # conversion for event_type [type = org.killbill.billing.notification.plugin.api.ExtBusEventType]
-          @event_type = Java::org.killbill.billing.notification.plugin.api.ExtBusEventType.value_of("#{@event_type.to_s}") unless @event_type.nil?
+          @event_type = Java::org.killbill.billing.notification.plugin.api.ExtBusEventType.value_of( @event_type.to_s ) unless @event_type.nil?
 
           # conversion for object_type [type = org.killbill.billing.ObjectType]
-          @object_type = Java::org.killbill.billing.ObjectType.value_of("#{@object_type.to_s}") unless @object_type.nil?
+          @object_type = Java::org.killbill.billing.ObjectType.value_of( @object_type.to_s ) unless @object_type.nil?
 
           # conversion for object_id [type = java.util.UUID]
           @object_id = java.util.UUID.fromString(@object_id.to_s) unless @object_id.nil?

data/lib/killbill/gen/plugin-api/payment_transaction_info_plugin.rb

@@ -47,7 +47,7 @@ module Killbill
           @kb_transaction_payment_id = java.util.UUID.fromString(@kb_transaction_payment_id.to_s) unless @kb_transaction_payment_id.nil?
 
           # conversion for transaction_type [type = org.killbill.billing.payment.api.TransactionType]
-          @transaction_type = Java::org.killbill.billing.payment.api.TransactionType.value_of("#{@transaction_type.to_s}") unless @transaction_type.nil?
+          @transaction_type = Java::org.killbill.billing.payment.api.TransactionType.value_of( @transaction_type.to_s ) unless @transaction_type.nil?
 
           # conversion for amount [type = java.math.BigDecimal]
           if @amount.nil?
@@ -57,7 +57,7 @@ module Killbill
           end
 
           # conversion for currency [type = org.killbill.billing.catalog.api.Currency]
-          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of("#{@currency.to_s}") unless @currency.nil?
+          @currency = Java::org.killbill.billing.catalog.api.Currency.value_of( @currency.to_s ) unless @currency.nil?
 
           # conversion for created_date [type = org.joda.time.DateTime]
           if !@created_date.nil?
@@ -72,7 +72,7 @@ module Killbill
           end
 
           # conversion for status [type = org.killbill.billing.payment.plugin.api.PaymentPluginStatus]
-          @status = Java::org.killbill.billing.payment.plugin.api.PaymentPluginStatus.value_of("#{@status.to_s}") unless @status.nil?
+          @status = Java::org.killbill.billing.payment.plugin.api.PaymentPluginStatus.value_of( @status.to_s ) unless @status.nil?
 
           # conversion for gateway_error [type = java.lang.String]
           @gateway_error = @gateway_error.to_s unless @gateway_error.nil?

data/lib/killbill/helpers/active_merchant.rb

@@ -3,8 +3,8 @@ module Killbill
     module ActiveMerchant
       require 'killbill'
 
-      require 'killbill/ext/active_merchant/jdbc_connection'
-      require 'killbill/ext/active_merchant/proxy_support'
+      require File.dirname(__FILE__) + '/properties_helper.rb'
+      require File.dirname(__FILE__) + '/active_merchant/active_record/active_record_helper.rb'
 
       require 'active_support/core_ext'
       require File.dirname(__FILE__) + '/active_merchant/core_ext.rb'

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

@@ -14,4 +14,4 @@ module Killbill
       end
     end
   end
-end
+end

data/lib/killbill/helpers/active_merchant/active_record/active_record_helper.rb

@@ -0,0 +1,14 @@
+module Killbill
+  module Plugin
+    module ActiveMerchant
+      module ActiveRecordHelper
+
+        def close_connection(logger = nil)
+          pool = ::ActiveRecord::Base.connection_pool
+          logger.debug { "after_request: pool.active_connection? = #{pool.active_connection?}, pool.connections.size = #{pool.connections.size}, connections = #{pool.connections.inspect}" } if logger
+          ::ActiveRecord::Base.connection.close if pool.active_connection? # check-in to pool
+        end
+      end
+    end
+  end
+end

data/lib/killbill/helpers/active_merchant/active_record/models/helpers.rb

@@ -34,6 +34,14 @@ module Killbill
           }
         end
 
+        def with_connection(&block)
+          self.connection_pool.with_connection(&block)
+        end
+
+        def with_connection_and_transaction(&block)
+          with_connection { self.transaction(&block) }
+        end
+
         # Useful helper to extract params from AM response objects, e.g. extract(response, 'card', 'address_country')
         def extract(response, key1, key2=nil, key3=nil)
           return nil if response.nil? || response.params.nil?

data/lib/killbill/helpers/active_merchant/active_record/models/payment_method.rb

@@ -12,6 +12,8 @@ module Killbill
           extend ::Killbill::Plugin::ActiveMerchant::Helpers
 
           self.abstract_class = true
+          # See Response#from_response
+          self.record_timestamps = false
 
           @@quotes_cache = build_quotes_cache
 
@@ -23,12 +25,12 @@ module Killbill
                           :kb_payment_method_id => kb_payment_method_id,
                           :kb_tenant_id         => kb_tenant_id,
                           :token                => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? response.authorization : (cc_or_token || response.authorization),
-                          :cc_first_name        => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.first_name : nil,
-                          :cc_last_name         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_name : nil,
-                          :cc_type              => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.brand : nil,
-                          :cc_exp_month         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.month : nil,
-                          :cc_exp_year          => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.year : nil,
-                          :cc_last_4            => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_digits : nil,
+                          :cc_first_name        => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.first_name : extra_params[:cc_first_name],
+                          :cc_last_name         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_name : extra_params[:cc_last_name],
+                          :cc_type              => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.brand : extra_params[:cc_type],
+                          :cc_exp_month         => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.month : extra_params[:cc_exp_month],
+                          :cc_exp_year          => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.year : extra_params[:cc_exp_year],
+                          :cc_last_4            => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.last_digits : extra_params[:cc_last_4],
                           :cc_number            => cc_or_token.kind_of?(::ActiveMerchant::Billing::CreditCard) ? cc_or_token.number : nil,
                           :address1             => (options[:billing_address] || {})[:address1],
                           :address2             => (options[:billing_address] || {})[:address2],
@@ -38,7 +40,7 @@ module Killbill
                           :country              => (options[:billing_address] || {})[:country],
                           :created_at           => current_time,
                           :updated_at           => current_time
-                      }.merge!(extra_params))
+                      }.merge!(extra_params.compact)) # Don't override with nil values
           end
 
           def self.from_kb_account_id(kb_account_id, kb_tenant_id)
@@ -59,7 +61,7 @@ module Killbill
             else
               payment_methods = where("kb_payment_method_id = #{@@quotes_cache[kb_payment_method_id]} AND kb_tenant_id = #{@@quotes_cache[kb_tenant_id]} AND is_deleted = #{@@quotes_cache[false]}")
             end
-            raise "No payment method found for payment method #{kb_payment_method_id}" if payment_methods.empty?
+            raise "No payment method found for payment method #{kb_payment_method_id} and tenant #{kb_tenant_id}" if payment_methods.empty?
             raise "Kill Bill payment method #{kb_payment_method_id} mapping to multiple active plugin payment methods" if payment_methods.size > 1
             payment_methods[0]
           end

data/lib/killbill/helpers/active_merchant/active_record/models/response.rb

@@ -13,11 +13,14 @@ module Killbill
           extend ::Killbill::Plugin::ActiveMerchant::Helpers
 
           self.abstract_class = true
+          self.record_timestamps = false
 
           @@quotes_cache = build_quotes_cache
 
           def self.from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, response, extra_params = {}, model = Response)
             # Under high load, Rails sometimes fails to set timestamps. Unclear why...
+            # But regardless, for performance reasons, we want to set these timestamps ourselves
+            # See ActiveRecord::Timestamp
             current_time = Time.now.utc
             model.new({
                           :api_call                     => api_call,
@@ -40,7 +43,7 @@ module Killbill
                           :success                      => response.success?,
                           :created_at                   => current_time,
                           :updated_at                   => current_time
-                      }.merge!(extra_params))
+                      }.merge!(extra_params.compact)) # Don't override with nil values
           end
 
           def self.create_response_and_transaction(identifier, transaction_model, api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, amount_in_cents, currency, extra_params = {}, model = Response)
@@ -48,7 +51,7 @@ module Killbill
 
             # Rails wraps all create/save calls in a transaction. To speed things up, create a single transaction for both rows.
             # This has a small gotcha in the unhappy path though (see below).
-            transaction do
+            with_connection_and_transaction do
               # Save the response to our logs
               response = from_response(api_call, kb_account_id, kb_payment_id, kb_payment_transaction_id, transaction_type, payment_processor_account_id, kb_tenant_id, gw_response, extra_params, model)
               response.save!(shared_activerecord_options)
@@ -87,15 +90,25 @@ module Killbill
             return response, transaction
           end
 
+          def self.from_kb_payment_id(transaction_model, kb_payment_id, kb_tenant_id)
+            association = transaction_model.table_name.singularize.to_sym
+            # Use eager_load to force Rails to issue a single query (see https://github.com/killbill/killbill-plugin-framework-ruby/issues/32)
+            eager_load(association)
+                .where(:kb_payment_id => kb_payment_id, :kb_tenant_id => kb_tenant_id)
+                .order(:created_at)
+          end
+
           def to_transaction_info_plugin(transaction=nil)
             if transaction.nil?
               amount_in_cents = nil
               currency        = nil
               created_date    = created_at
+              status          = :UNDEFINED # Likely pending
             else
               amount_in_cents = transaction.amount_in_cents
               currency        = transaction.currency
               created_date    = transaction.created_at
+              status          = success ? :PROCESSED : :ERROR
             end
 
             t_info_plugin                             = Killbill::Plugin::Model::PaymentTransactionInfoPlugin.new
@@ -106,7 +119,7 @@ module Killbill
             t_info_plugin.currency                    = currency
             t_info_plugin.created_date                = created_date
             t_info_plugin.effective_date              = effective_date
-            t_info_plugin.status                      = (success ? :PROCESSED : :ERROR)
+            t_info_plugin.status                      = status
             t_info_plugin.gateway_error               = gateway_error
             t_info_plugin.gateway_error_code          = gateway_error_code
             t_info_plugin.first_payment_reference_id  = first_reference_id

data/lib/killbill/helpers/active_merchant/active_record/models/streamy_result_set.rb

@@ -36,9 +36,7 @@ module Killbill
             pool = ::ActiveRecord::Base.connection_pool
             return unless pool.active_connection?
 
-            connection = ::ActiveRecord::Base.connection
-            pool.remove(connection)
-            connection.disconnect!
+            ::ActiveRecord::Base.connection.close # check-in to pool
           end
         end
       end

data/lib/killbill/helpers/active_merchant/active_record/models/transaction.rb

@@ -9,6 +9,8 @@ module Killbill
           extend ::Killbill::Plugin::ActiveMerchant::Helpers
 
           self.abstract_class = true
+          # See Response#from_response
+          self.record_timestamps = false
 
           @@quotes_cache = build_quotes_cache
 

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

@@ -1,4 +1,5 @@
 require 'logger'
+require 'pathname'
 require 'thread_safe'
 
 module Killbill
@@ -12,39 +13,31 @@ module Killbill
       mattr_reader :kb_apis
       mattr_reader :gateway_name
       mattr_reader :gateway_builder
+      # To be kept in sync with sinatra.rb
       mattr_reader :logger
       mattr_reader :config_key_name
       mattr_reader :per_tenant_config_cache
 
-
       class << self
 
         def initialize!(gateway_builder, gateway_name, logger, config_key_name, config_file, kb_apis)
-
           @@logger = logger
           @@kb_apis = kb_apis
           @@gateway_name = gateway_name
           @@gateway_builder = gateway_builder
           @@config_key_name = config_key_name
           @@per_tenant_config_cache = ThreadSafe::Cache.new
+          @@per_tenant_gateways_cache = ThreadSafe::Cache.new
 
-          if defined?(JRUBY_VERSION)
-            begin
-              # See https://github.com/jruby/activerecord-jdbc-adapter/issues/302
-              require 'jdbc/mysql'
-              ::Jdbc::MySQL.load_driver(:require) if ::Jdbc::MySQL.respond_to?(:load_driver)
-            rescue => e
-              @@logger.warn "Unable to load the JDBC driver: #{e}"
-            end
-          end
-
-          initialize_from_global_config!(gateway_builder, gateway_name, logger, config_file)
+          initialize_from_global_config!(config_file)
         end
 
-
         def gateways(kb_tenant_id=nil)
-          tenant_config = get_tenant_config(kb_tenant_id)
-          extract_gateway_config(tenant_config)
+          if @@per_tenant_gateways_cache[kb_tenant_id].nil?
+            tenant_config = get_tenant_config(kb_tenant_id)
+            @@per_tenant_gateways_cache[kb_tenant_id] = extract_gateway_config(tenant_config)
+          end
+          @@per_tenant_gateways_cache[kb_tenant_id]
         end
 
         def currency_conversions(kb_tenant_id=nil)
@@ -56,8 +49,9 @@ module Killbill
           end
         end
 
+        # To be kept in sync with sinatra.rb
         def config(kb_tenant_id=nil)
-          get_tenant_config(kb_tenant_id)
+          @@glob_config.merge(get_tenant_config(kb_tenant_id) || {})
         end
 
         def converted_currency(currency, kb_tenant_id=nil)
@@ -69,6 +63,7 @@ module Killbill
         def invalidate_tenant_config!(kb_tenant_id)
           @@logger.info("Invalidate plugin key #{@@config_key_name}, tenant = #{kb_tenant_id}")
           @@per_tenant_config_cache[kb_tenant_id] = nil
+          @@per_tenant_gateways_cache[kb_tenant_id] = nil
         end
 
         private
@@ -83,19 +78,18 @@ module Killbill
               if gateway_account_id.nil?
                 @@logger.warn "Skipping config #{gateway_config} -- missing :account_id"
               else
-                gateways_config[gateway_account_id.to_sym] = Gateway.wrap(gateway_builder, logger, gateway_config)
+                gateways_config[gateway_account_id.to_sym] = Gateway.wrap(gateway_builder, gateway_config)
                 default_gateway = gateways_config[gateway_account_id.to_sym] if idx == 0
               end
             end
             gateways_config[:default] = default_gateway if gateways_config[:default].nil?
           else
-            gateways_config[:default] = Gateway.wrap(@@gateway_builder, logger, gateway_configs)
+            gateways_config[:default] = Gateway.wrap(@@gateway_builder, gateway_configs)
           end
           gateways_config
         end
 
         def get_tenant_config(kb_tenant_id)
-
           if @@per_tenant_config_cache[kb_tenant_id].nil?
             # Make the api api to verify if there is a per tenant value
             context = @@kb_apis.create_context(kb_tenant_id) if kb_tenant_id
@@ -113,30 +107,128 @@ module Killbill
           @@per_tenant_config_cache[kb_tenant_id]
         end
 
-        def initialize_from_global_config!(gateway_builder, gateway_name, logger, config_file)
+        def initialize_from_global_config!(config_file)
           # Look for global config
-          @@glob_config = Properties.new(config_file)
-          @@glob_config.parse!
+          if !config_file.blank? && Pathname.new(config_file).file?
+            @@glob_config = Properties.new(config_file)
+            @@glob_config.parse!
+            @@glob_config = @@glob_config.to_hash
+          else
+            @@glob_config = {}
+          end
 
           @@logger.log_level = Logger::DEBUG if (@@glob_config[:logger] || {})[:debug]
 
           @@glob_currency_conversions = @@glob_config[:currency_conversions]
 
+          initialize_active_record
+
+          initialize_active_merchant
+
+          @@initialized = true
+        end
+
+        def initialize_active_record
           begin
             require 'active_record'
-            ::ActiveRecord::Base.establish_connection(@@glob_config[:database])
+            require 'arjdbc' if defined?(JRUBY_VERSION)
+            db_config = @@glob_config[:database]
+
+            if db_config.nil?
+              # Sane defaults for running as a Kill Bill plugin
+              db_config = {
+                  :adapter              => :mysql,
+                  # See KillbillActivator#KILLBILL_OSGI_JDBC_JNDI_NAME
+                  :jndi                 => 'killbill/osgi/jdbc',
+                  # See https://github.com/kares/activerecord-bogacs
+                  :pool                 => false,
+                  # Since AR-JDBC 1.4, to disable session configuration
+                  :configure_connection => false
+              }
+            end
+
+            if defined?(JRUBY_VERSION) && db_config.is_a?(Hash)
+              if db_config[:jndi]
+                # Lookup the DataSource object once, for performance reasons
+                begin
+                  db_config[:data_source] = Java::JavaxNaming::InitialContext.new.lookup(db_config[:jndi].to_s)
+                  db_config.delete(:jndi)
+                rescue Java::javax.naming.NamingException => e
+                  # See https://github.com/killbill/killbill-plugin-framework-ruby/issues/39
+                  @@logger.warn "Unable to lookup JNDI DataSource (yet?): #{e}" unless defined?(JBUNDLER_CLASSPATH)
+                end
+              end
+
+              # we accept a **pool: false** configuration in which case we
+              # the built-in pool is replaced with a false one (under JNDI) :
+              if db_config[:pool] == false && ( db_config[:jndi] || db_config[:data_source] )
+                begin; require 'active_record/bogacs'
+                pool_class = ::ActiveRecord::Bogacs::FalsePool
+                ::ActiveRecord::ConnectionAdapters::ConnectionHandler.connection_pool_class = pool_class
+                rescue LoadError
+                  db_config.delete(:pool) # do not confuse AR's built-in pool
+                  @@logger.warn "ActiveRecord-Bogacs missing, will use default (built-in) AR pool."
+                end
+              end
+            end
+            ::ActiveRecord::Base.establish_connection(db_config)
             ::ActiveRecord::Base.logger = @@logger
           rescue => e
             @@logger.warn "Unable to establish a database connection: #{e}"
           end
+        end
+
+        # Configure global properties
+        # It would be nice to fix ActiveMerchant to make these configurable on a per instance basis
+        def initialize_active_merchant
+          require 'active_merchant'
+
+          ::ActiveMerchant::Billing::Gateway.logger = @@logger
+
+          am_config = @@glob_config[@@gateway_name.to_sym]
+          if am_config.is_a?(Array)
+            default_gateway_config = {}
+            am_config.each_with_index do |gateway_config, idx|
+              gateway_account_id = gateway_config[:account_id]
+              if gateway_account_id.nil?
+                @@logger.warn "Skipping config #{gateway_config} -- missing :account_id"
+              else
+                default_gateway_config = gateway_config if idx == 0 || gateway_account_id == :default
+              end
+            end
+            am_config = default_gateway_config
+          end
+          am_config ||= {
+              # Sane defaults
+              :test => true
+          }
+
+          if am_config[:test]
+            ::ActiveMerchant::Billing::Base.mode = :test
+          end
+
+          if am_config[:log_file]
+            ::ActiveMerchant::Billing::Gateway.wiredump_device = File.open(am_config[:log_file], 'w')
+          else
+            log_method = am_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  = am_config[:open_timeout] unless am_config[:open_timeout].nil?
+          ::ActiveMerchant::Billing::Gateway.read_timeout  = am_config[:read_timeout] unless am_config[:read_timeout].nil?
+          ::ActiveMerchant::Billing::Gateway.retry_safe    = am_config[:retry_safe] unless am_config[:retry_safe].nil?
+          ::ActiveMerchant::Billing::Gateway.ssl_strict    = am_config[:ssl_strict] unless am_config[:ssl_strict].nil?
+          ::ActiveMerchant::Billing::Gateway.ssl_version   = am_config[:ssl_version] unless am_config[:ssl_version].nil?
+          ::ActiveMerchant::Billing::Gateway.max_retries   = am_config[:max_retries] unless am_config[:max_retries].nil?
+          ::ActiveMerchant::Billing::Gateway.proxy_address = am_config[:proxy_address] unless am_config[:proxy_address].nil?
+          ::ActiveMerchant::Billing::Gateway.proxy_port    = am_config[:proxy_port] unless am_config[:proxy_port].nil?
 
           # Configure the ActiveMerchant HTTP backend
-          connection_type = (@@glob_config[:active_merchant] || {})[:connection_type]
+          connection_type = (@@glob_config[:active_merchant] || am_config)[:connection_type]
           if connection_type == :typhoeus
             require 'killbill/ext/active_merchant/typhoeus_connection'
           end
-
-          @@initialized = true
         end
       end
     end