diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-20 11:20:09 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-20 11:20:09 -0700 |
| commit | 7150a9dc036ca02e8293d31ac57a26c55860fff7 (patch) | |
| tree | 0ce89e66f10e29aebee997109293ba157aeb6412 /activerecord/lib | |
| parent | acb78c27e868d2b30d89fceb912b353169f1fd1d (diff) | |
| download | rails-7150a9dc036ca02e8293d31ac57a26c55860fff7.tar.gz rails-7150a9dc036ca02e8293d31ac57a26c55860fff7.tar.bz2 rails-7150a9dc036ca02e8293d31ac57a26c55860fff7.zip | |
Revert "default the reaping frequency to 10 seconds"
mysql can't handle a parallel thread pinging the connection, so we can
get wrong results or segvs
This reverts commit 7cc588b684f6d1af3e7fab1edfa6715e269e41a2.
Diffstat (limited to 'activerecord/lib')
| -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 9137504d15..1754e424b8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -238,7 +238,7 @@ module ActiveRecord @checkout_timeout = spec.config[:checkout_timeout] || 5 @dead_connection_timeout = spec.config[:dead_connection_timeout] || 5 - @reaper = Reaper.new(self, spec.config[:reaping_frequency] || 10) + @reaper = Reaper.new self, spec.config[:reaping_frequency] @reaper.run # default max pool size to 5 |