Handle cases where logger is not a tagged logger.

Previously, a TaggedLoggerProxy was only created if the logger responded to
:tagged, but was still used as if it was a TaggedLoggerProxy elsewhere in the
code, causing undefined method  errors.

This moved the check for tagging abilities inside the TaggedLoggerProxy so the
code can always tread the logger like a tagged logger, and if it is not a
tagged logger the tags will just be ignored. This prevents needing to check
if the logger is tagged every time we use it.

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/action_cable/server/worker/active_record_connection_management.rb b/lib/action_cable/server/worker/active_record_connection_management.rb
index 1ede0095f8..ecece4e270 100644
--- a/lib/action_cable/server/worker/active_record_connection_management.rb
+++ b/lib/action_cable/server/worker/active_record_connection_management.rb
@@ -12,7 +12,7 @@ module ActionCable
         end
 
         def with_database_connections
-          ActiveRecord::Base.logger.tagged(*connection.logger.tags) { yield }
+          connection.logger.tag(ActiveRecord::Base.logger) { yield }
         ensure
           ActiveRecord::Base.clear_active_connections!
         end