activerecord_connection_reaper 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f5626f8dd3cf90b2b020485814417cacd487528ec1c0d994e8ab1e55628f8a
-  data.tar.gz: 7020099fc782b21c78cd8522afee666a23954befc40d9f17a9b6254d31832b0b
+  metadata.gz: cde5ce57597f3080ebda91544487f81477143a38d99355e4eb8ee4e70d0b75e3
+  data.tar.gz: 23d8417049ec5aa708458063d2227ef7825a62f8e54b44c64f9b083ab5f1280e
 SHA512:
-  metadata.gz: '08bd4767c9a37ef218fd9c3448ed54481dea420ae51af0b5b11ba5cafa606b5ca960d89ffa31f762b597333baa047386c5c213cf672b43f877389efe4cf0253a'
-  data.tar.gz: f4762978b2679a85db1b5791b83067bbade6900d8a253a2a24438bf3bce6f8599e682cca7e1ce72fdab9482b2a3fd665e06486542c5145843e2b7d57278c30ce
+  metadata.gz: ebaff298730cb4acbeaff6adf2e92fb6ed31471ba178e5b50ffeff410a6cb92bcec683d1bed824ec143dd550897825eecea8f280b2f34565cf00e4d989ff1409
+  data.tar.gz: f30372920b56840936cb5cb4bdfc29360fde15421480605ec6cbec4c2cfb5eaa74e495dad983d1bfa37cbf72b3b2e522a663ae6b8e7b48a6c43e63341713a740

data/Rakefile

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
-require 'minitest/test_task'
-
-Minitest::TestTask.create # rubocop:disable Rails/SaveBang
-
+require 'rake/testtask'
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
 
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+  t.warning = false
+end
+
 task static: :rubocop
 task default: %i[static test]

data/lib/activerecord_connection_reaper/extensions/active_record/connection_adapters/abstract_adapter_track_connected_since.rb

@@ -23,9 +23,9 @@ module ActiveRecordConnectionReaper
             duration * (1.0 - @pool_jitter)
           end
 
-          MAX_JITTER = 0.0..1.0
+          MAX_JITTER = 1.0
           def max_jitter
-            (@config[:pool_jitter] || 0.2).to_f.clamp(MAX_JITTER)
+            (@config[:pool_jitter] || 0.2).to_f.clamp(0.0, MAX_JITTER)
           end
         end
       end

data/lib/activerecord_connection_reaper/extensions/active_record/connection_adapters/pool_max_age.rb

@@ -28,6 +28,10 @@ module ActiveRecordConnectionReaper
 
             old_connections.each(&:disconnect!)
           end
+
+          def __patched_discarded?
+            @connections.nil?
+          end
         end
       end
     end

data/lib/activerecord_connection_reaper/extensions/active_record/connection_adapters/reaper_check_max_age.rb

@@ -1,24 +1,65 @@
+require 'weakref'
+
 module ActiveRecordConnectionReaper
   module Extensions
     module ActiveRecord
       module ConnectionAdapters
         module ReaperCheckMaxAge
-          def run
-            return unless frequency&.positive?
-            Thread.new(frequency, pool) do |t, p|
-              loop do
-                sleep t
-                run_once(p)
+          def self.prepended(base)
+            base.instance_variable_set(:@mutex, Mutex.new) if base.instance_variable_get(:@mutex).nil?
+            base.instance_variable_set(:@pools, {}) if base.instance_variable_get(:@pools).nil?
+            base.instance_variable_set(:@threads, {}) if base.instance_variable_get(:@threads).nil?
+
+            base.singleton_class.send(:prepend, ClassMethods)
+          end
+
+          module ClassMethods
+            def __patched_register_pool(pool, frequency) # :nodoc:
+              @mutex.synchronize do
+                @threads[frequency] = __patched_spawn_thread(frequency) unless @threads[frequency]&.alive?
+                @pools[frequency] ||= []
+                @pools[frequency] << WeakRef.new(pool)
               end
             end
-          end
 
-          private
+            private
+
+            def __patched_spawn_thread(frequency) # rubocop:disable Metrics/MethodLength
+              Thread.new(frequency) do |t|
+                # Advise multi-threaded app servers to ignore this thread for
+                # the purposes of fork safety warnings
+                Thread.current.thread_variable_set(:fork_safe, true)
+                Thread.current.name = 'AR Pool Reaper'
+                running = true
+                while running
+                  sleep t
+                  @mutex.synchronize do
+                    @pools[frequency].select! do |pool|
+                      pool.weakref_alive? && !pool.__patched_discarded?
+                    end
 
-          def run_once(pool)
-            pool.reap
-            pool.flush
-            pool.retire_old_connections
+                    @pools[frequency].each do |p|
+                      p.reap
+                      p.flush
+                      p.retire_old_connections
+                    rescue WeakRef::RefError
+                      # Pool has been garbage collected. Nothing we can do here, move on.
+                    end
+
+                    if @pools[frequency].empty?
+                      @pools.delete(frequency)
+                      @threads.delete(frequency)
+                      running = false
+                    end
+                  end
+                end
+              end
+            end
+          end
+
+          def run
+            return unless frequency&.positive?
+            self.class.__patched_register_pool(pool, frequency)
           end
         end
       end

data/lib/activerecord_connection_reaper/railtie.rb

@@ -9,9 +9,9 @@ module ActiveRecordConnectionReaper
       require 'activerecord_connection_reaper/extensions/active_record/connection_adapters/reaper_check_max_age'
       require 'activerecord_connection_reaper/extensions/active_record/connection_adapters/pool_max_age'
 
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecordConnectionReaper::Extensions::ActiveRecord::ConnectionAdapters::AbstractAdapterTrackConnectedSince)
-      ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper.prepend(ActiveRecordConnectionReaper::Extensions::ActiveRecord::ConnectionAdapters::ReaperCheckMaxAge)
-      ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(ActiveRecordConnectionReaper::Extensions::ActiveRecord::ConnectionAdapters::PoolMaxAge)
+      ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend(ActiveRecordConnectionReaper::Extensions::ActiveRecord::ConnectionAdapters::AbstractAdapterTrackConnectedSince) # rubocop:disable Layout/LineLength
+      ActiveRecord::ConnectionAdapters::ConnectionPool::Reaper.prepend(ActiveRecordConnectionReaper::Extensions::ActiveRecord::ConnectionAdapters::ReaperCheckMaxAge) # rubocop:disable Layout/LineLength
+      ActiveRecord::ConnectionAdapters::ConnectionPool.prepend(ActiveRecordConnectionReaper::Extensions::ActiveRecord::ConnectionAdapters::PoolMaxAge) # rubocop:disable Layout/LineLength
     end
   end
 end

data/lib/activerecord_connection_reaper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordConnectionReaper
-  VERSION = '0.2.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_connection_reaper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Miriam Technologies
@@ -77,9 +77,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.5'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: 3.4.0
+      version: '3.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="