aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/reaper_test.rb
diff options
context:
space:
mode:
authorJonathan Rochkind <jonathan@dnil.net>2012-05-23 12:08:11 -0400
committerJonathan Rochkind <jonathan@dnil.net>2012-05-23 12:08:11 -0400
commitcb6f839359bd894feb0a1105b79af72b336aa41e (patch)
treedc0683e9c13633ab79ef9fd9a24e150954bd6ecf /activerecord/test/cases/reaper_test.rb
parentc1487f619045840d89f1e2dbc6e133e1c2cbf2f4 (diff)
downloadrails-cb6f839359bd894feb0a1105b79af72b336aa41e.tar.gz
rails-cb6f839359bd894feb0a1105b79af72b336aa41e.tar.bz2
rails-cb6f839359bd894feb0a1105b79af72b336aa41e.zip
ConnectionPool wait_timeout no longer used for different types of timeouts. #6441
An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same.
Diffstat (limited to 'activerecord/test/cases/reaper_test.rb')
-rw-r--r--activerecord/test/cases/reaper_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb
index 576ab60090..e53a27d5dd 100644
--- a/activerecord/test/cases/reaper_test.rb
+++ b/activerecord/test/cases/reaper_test.rb
@@ -64,7 +64,7 @@ module ActiveRecord
spec.config[:reaping_frequency] = 0.0001
pool = ConnectionPool.new spec
- pool.timeout = 0
+ pool.dead_connection_timeout = 0
conn = pool.checkout
count = pool.connections.length