From 41c24eb3e38af99b208c17041199832a0372da8f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 30 Dec 2011 15:27:41 -0800
Subject: [PATCH] each connection pool has a reaper

---
 .../connection_adapters/abstract/connection_pool.rb  |  6 +++++-
 .../connection_adapters/connection_specification.rb  |  2 +-
 activerecord/test/cases/reaper_test.rb               | 12 ++++++++++++
 3 files changed, 18 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 a26c435dad..f5c2c4f339 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -64,6 +64,9 @@ module ActiveRecord
     # * +wait_timeout+: number of seconds to block and wait for a connection
     #   before giving up and raising a timeout error (default 5 seconds).
     class ConnectionPool
+      # Every +frequency+ seconds, the reaper will call +reap+ on +pool+.
+      # A reaper instantiated with a nil frequency will never reap the
+      # connection pool.
       class Reaper
         attr_reader :pool, :frequency
 
@@ -86,7 +89,7 @@ module ActiveRecord
       include MonitorMixin
 
       attr_accessor :automatic_reconnect, :timeout
-      attr_reader :spec, :connections, :size
+      attr_reader :spec, :connections, :size, :reaper
 
       # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
       # object which describes database connection information (e.g. adapter,
@@ -103,6 +106,7 @@ module ActiveRecord
         @reserved_connections = {}
 
         @timeout = spec.config[:wait_timeout] || 5
+        @reaper  = Reaper.new self, spec.config[:reaping_frequency]
 
         # default max pool size to 5
         @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
diff --git a/activerecord/lib/active_record/connection_adapters/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
index 3e67c3a2b7..34bdcc0802 100644
--- a/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/connection_specification.rb
@@ -3,7 +3,7 @@ module ActiveRecord
     class ConnectionSpecification #:nodoc:
       attr_reader :config, :adapter_method
 
-      def initialize (config, adapter_method)
+      def initialize(config, adapter_method)
         @config, @adapter_method = config, adapter_method
       end
 
diff --git a/activerecord/test/cases/reaper_test.rb b/activerecord/test/cases/reaper_test.rb
index ed3daa175d..3ef86ec5e1 100644
--- a/activerecord/test/cases/reaper_test.rb
+++ b/activerecord/test/cases/reaper_test.rb
@@ -41,6 +41,18 @@ module ActiveRecord
         sleep 0.0002
         assert_equal(count - 1, pool.connections.length)
       end
+
+      def test_pool_has_reaper
+        assert pool.reaper
+      end
+
+      def test_reaping_frequency_configuration
+        spec = ActiveRecord::Base.connection_pool.spec
+        spec = ConnectionSpecification.new(spec.config.dup, spec.adapter_method)
+        spec.config[:reaping_frequency] = 100
+        pool = ConnectionPool.new spec
+        assert_equal 100, pool.reaper.frequency
+      end
     end
   end
 end