Performance improvements and removal of branching of processing by legacy handlers.

Author: masato-hi

lib/activerecord-refresh_connection/active_record/connection_adapters/refresh_connection_management.rb

@@ -9,8 +9,8 @@ def initialize(app, options = {})
         @app = app
         @options = DEFAULT_OPTIONS.merge(options)
         @mutex = Mutex.new
-        @ar_version = ActiveRecord.gem_version.to_s
 
+        resolve_clear_connections
         reset_remain_count
       end
 
@@ -33,32 +33,25 @@ def call(env)
       private
 
       def clear_connections
-        if @ar_version >= AR_VERSION_6_1
-          if legacy_connection_handling?
-            clear_legacy_compatible_connections
-          else
-            clear_multi_db_connections
-          end
-        elsif @ar_version >= AR_VERSION_6_0
-          clear_legacy_compatible_connections
-        else
-          clear_legacy_connections
-        end
+        __send__(@clear_connections)
       end
 
-      def legacy_connection_handling?
-        begin
-          ActiveRecord::Base.legacy_connection_handling
-        rescue NoMethodError
-          false
-        end
+      def resolve_clear_connections
+        ar_version = ActiveRecord.gem_version.to_s
+
+        @clear_connections =
+          if ar_version >= AR_VERSION_6_1
+            :clear_multi_db_connections
+          elsif ar_version >= AR_VERSION_6_0
+            :clear_legacy_compatible_connections
+          else
+            :clear_legacy_connections
+          end
       end
 
       def clear_multi_db_connections
         if should_clear_all_connections?
-          ActiveRecord::Base.connection_handler.all_connection_pools.each do |pool|
-            pool.disconnect!
-          end
+          ActiveRecord::Base.connection_handler.all_connection_pools.each(&:disconnect!)
         else
           ActiveRecord::Base.connection_handler.all_connection_pools.each do |pool|
             pool.release_connection if pool.active_connection? && !pool.connection.transaction_open?
@@ -68,13 +61,9 @@ def clear_multi_db_connections
 
       def clear_legacy_compatible_connections
         if should_clear_all_connections?
-          ActiveRecord::Base.connection_handlers.each_value do |connection_handler|
-            connection_handler.clear_all_connections!
-          end
+          ActiveRecord::Base.connection_handlers.each_value(&:clear_all_connections!)
         else
-          ActiveRecord::Base.connection_handlers.each_value do |connection_handler|
-            connection_handler.clear_active_connections!
-          end
+          ActiveRecord::Base.connection_handlers.each_value(&:clear_active_connections!)
         end
       end