Merge pull request #16542 from seamusabshere/numerify-pool-checkout-timeout-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
上级 57cf426e
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册