diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 01:35:29 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 01:37:07 -0300 |
| commit | 70c2777d1c2bfaf538c5bc892a5c3f96f67291f1 (patch) | |
| tree | da637ec1b0c6a1ba9e1dd5cfddd982b41ecfe7b3 /activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | |
| parent | 7c6861b0bc85077ed1f1dcb4a919de0f1b8d490d (diff) | |
| parent | 27955b4bb11fc6a7ee8a0fcaff53b6fc175a9655 (diff) | |
| download | rails-70c2777d1c2bfaf538c5bc892a5c3f96f67291f1.tar.gz rails-70c2777d1c2bfaf538c5bc892a5c3f96f67291f1.tar.bz2 rails-70c2777d1c2bfaf538c5bc892a5c3f96f67291f1.zip | |
Merge pull request #18080 from korbin/fix_reaping_frequency_configuration
Fix issue with reaping_frequency type.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb index 3968b90341..6235745fb2 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -236,7 +236,7 @@ module ActiveRecord @spec = spec @checkout_timeout = (spec.config[:checkout_timeout] && spec.config[:checkout_timeout].to_f) || 5 - @reaper = Reaper.new self, spec.config[:reaping_frequency] + @reaper = Reaper.new(self, (spec.config[:reaping_frequency] && spec.config[:reaping_frequency].to_f)) @reaper.run # default max pool size to 5 |