diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-30 16:10:53 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-30 16:10:53 -0800 |
| commit | 59f2696d0012c451190a9e3fe1b92c3619dee1a2 (patch) | |
| tree | 431909c726fca4537f17ab762a27942b5dae2fe1 /activerecord/lib | |
| parent | 405aeb5da4eea3b9defdea2ce0920725dcd75308 (diff) | |
| download | rails-59f2696d0012c451190a9e3fe1b92c3619dee1a2.tar.gz rails-59f2696d0012c451190a9e3fe1b92c3619dee1a2.tar.bz2 rails-59f2696d0012c451190a9e3fe1b92c3619dee1a2.zip | |
rename start to run and use Thread.pass rather than sleeping to schedule the watchdog
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb | 4 |
1 files changed, 2 insertions, 2 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 |