Make sure active record queries are logged with the current connection tags

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/action_cable/connection/tagged_logger_proxy.rb b/lib/action_cable/connection/tagged_logger_proxy.rb
index 854f613f1c..34063c1d42 100644
--- a/lib/action_cable/connection/tagged_logger_proxy.rb
+++ b/lib/action_cable/connection/tagged_logger_proxy.rb
@@ -4,6 +4,8 @@ module ActionCable
     # ActiveSupport::TaggedLogging-enhanced Rails.logger, as that logger will reset the tags between requests.
     # The connection is long-lived, so it needs its own set of tags for its independent duration.
     class TaggedLoggerProxy
+      attr_reader :tags
+
       def initialize(logger, tags:)
         @logger = logger
         @tags = tags.flatten
@@ -22,7 +24,8 @@ module ActionCable
 
       protected
         def log(type, message)
-          @logger.tagged(*@tags) { @logger.send type, message }
+          current_tags = tags - @logger.formatter.current_tags
+          @logger.tagged(*current_tags) { @logger.send type, message }
         end
     end
   end