Browse files

Merge pull request #16542 from seamusabshere/numerify-pool-checkout-t…

…imeout-from-urls-4-1-stable

Make sure :checkout_timeout and :dead_connection_timeout are numbers
Conflicts:
	activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
  • Loading branch information...
1 parent 57cf426 commit dfeeecd2f3bde70f22174843ccfc594610b4eebc @rafaelfranca rafaelfranca committed Aug 18, 2014
View
2 activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -234,7 +234,7 @@ def initialize(spec)
@spec = spec
- @checkout_timeout = spec.config[:checkout_timeout] || 5
+ @checkout_timeout = (spec.config[:checkout_timeout] && spec.config[:checkout_timeout].to_f) || 5
@reaper = Reaper.new self, spec.config[:reaping_frequency]
@reaper.run

0 comments on commit dfeeecd

Please sign in to comment.