Removes close_db_connection! deprecation warning (#334)

Method was deprecated in Rails rails/rails@a93d8fe
discourse · Aug 14, 2023 · df15dbe · df15dbe
1 parent 67163f5
commit df15dbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,7 @@
 FUTURE
 
 - FIX: Typo in `group_ids_lookup` option name in Redis params exclusion list that was preventing the use of the redis backend along with this option.
+- FIX: Removes close_db_connection! deprecation warning.
 
 28-06-2023
 

diff --git a/lib/message_bus/rack/middleware.rb b/lib/message_bus/rack/middleware.rb
@@ -199,7 +199,9 @@ def close_db_connection!
     # ConnectionManagement in Rails puts a BodyProxy around stuff
     #  this means connections are not returned until rack.async is
     #  closed
-    if defined? ActiveRecord::Base.clear_active_connections!
+    if defined? ActiveRecord::Base.connection_handler
+      ActiveRecord::Base.connection_handler.clear_active_connections!
+    elsif defined? ActiveRecord::Base.clear_active_connections!
       ActiveRecord::Base.clear_active_connections!
     end
   end