From 43c6c7787954d959347a1f90d71b11ba0cb7a8c7 Mon Sep 17 00:00:00 2001 From: Lachlan Sylvester Date: Wed, 18 Nov 2015 22:53:23 +1100 Subject: 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. --- lib/action_cable/server/worker/active_record_connection_management.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/action_cable/server') 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 -- cgit v1.2.3