activerecord_connection_reaper 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f5626f8dd3cf90b2b020485814417cacd487528ec1c0d994e8ab1e55628f8a
-  data.tar.gz: 7020099fc782b21c78cd8522afee666a23954befc40d9f17a9b6254d31832b0b
+  metadata.gz: de859231591ab97c462288d661a36ec93f747a8d9352c82cc841bd21c7f90c0b
+  data.tar.gz: '09c5737830cab9916e818c4a6f7d535bf640c90bc301835c2d692d2299d9baeb'
 SHA512:
-  metadata.gz: '08bd4767c9a37ef218fd9c3448ed54481dea420ae51af0b5b11ba5cafa606b5ca960d89ffa31f762b597333baa047386c5c213cf672b43f877389efe4cf0253a'
-  data.tar.gz: f4762978b2679a85db1b5791b83067bbade6900d8a253a2a24438bf3bce6f8599e682cca7e1ce72fdab9482b2a3fd665e06486542c5145843e2b7d57278c30ce
+  metadata.gz: 6c0e49d19b53bc68a2b2d1245c0ab80dddf78f88c29d59a791f1fa36ea0d99da8d6673019322783929f2ec18a1d7d72bc04e8364bbbdcf520408f77c262ee0a5
+  data.tar.gz: 4d7d68d0aa1d24b325667441f02f4608e2d2fbd3b5e6fd93a0e1f6a383bc820d86d8cf3e727b483650a49fe912c624811eddf4afd4c5e1d8935a9882e20b0b16

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordConnectionReaper
-  VERSION = '0.2.0'
+  VERSION = '0.3.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.3.0
 platform: ruby
 authors:
 - Miriam Technologies