diff options
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/reaper_test.rb | 50 |
2 files changed, 31 insertions, 23 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 7667d9a17c..29daef89a6 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb @@ -75,7 +75,7 @@ module ActiveRecord @frequency = frequency end - def start + def run return unless frequency Thread.new(frequency, pool) { |t, p| while true @@ -107,7 +107,7 @@ module ActiveRecord @timeout = spec.config[:wait_timeout] || 5 @reaper = Reaper.new self, spec.config[:reaping_frequency] - @reaper.start + @reaper.run # default max pool size to 5 @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5 diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb index 9149d45e7c..576ab60090 100644 --- a/activerecord/test/cases/reaper_test.rb +++ b/activerecord/test/cases/reaper_test.rb @@ -15,31 +15,37 @@ module ActiveRecord @pool.connections.each(&:close) end - # A reaper with nil time should never reap connections - def test_nil_time - conn = pool.checkout - pool.timeout = 0 + class FakePool + attr_reader :reaped - count = pool.connections.length - conn.extend(Module.new { def active?; false; end; }) + def initialize + @reaped = false + end - reaper = ConnectionPool::Reaper.new(pool, nil) - reaper.start - sleep 0.0001 - assert_equal count, pool.connections.length + def reap + @reaped = true + end end - def test_some_time - conn = pool.checkout - pool.timeout = 0 - - count = pool.connections.length - conn.extend(Module.new { def active?; false; end; }) + # A reaper with nil time should never reap connections + def test_nil_time + fp = FakePool.new + assert !fp.reaped + reaper = ConnectionPool::Reaper.new(fp, nil) + reaper.run + assert !fp.reaped + end - reaper = ConnectionPool::Reaper.new(pool, 0.0001) - reaper.start - sleep 0.0002 - assert_equal(count - 1, pool.connections.length) + def test_some_time + fp = FakePool.new + assert !fp.reaped + + reaper = ConnectionPool::Reaper.new(fp, 0.0001) + reaper.run + until fp.reaped + Thread.pass + end + assert fp.reaped end def test_pool_has_reaper @@ -65,7 +71,9 @@ module ActiveRecord conn.extend(Module.new { def active?; false; end; }) - sleep 0.0002 + while count == pool.connections.length + Thread.pass + end assert_equal(count - 1, pool.connections.length) end end |