Correctly release connections in cable apps

rage-rb · Sep 11, 2024 · 143499f · 143499f
1 parent bc2fb2e
commit 143499f
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/lib/rage/cable/channel.rb b/lib/rage/cable/channel.rb
@@ -135,7 +135,7 @@ def __register_action_proc(action_name)
       end
 
       is_subscribing = action_name == :subscribed
-      activerecord_loaded = defined?(::ActiveRecord)
+      should_release_connections = Rage.config.internal.should_manually_release_ar_connections?
 
       method_name = class_eval <<~RUBY, __FILE__, __LINE__ + 1
         def __run_#{action_name}(data)
@@ -163,13 +163,10 @@ def __run_#{action_name}(data)
           #{periodic_timers_chunk}
           #{rescue_handlers_chunk}
 
-          #{if activerecord_loaded
+          #{if should_release_connections
             <<~RUBY
             ensure
-              # TODO
-              if ActiveRecord::Base.connection_pool.active_connection?
-                ActiveRecord::Base.connection_handler.clear_active_connections!
-              end
+              ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
             RUBY
           end}
         end