aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/connection/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-11 17:22:12 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-11 17:22:12 +0100
commitcf4d9aa992f99ca19fd32446d081ba7d145fbeae (patch)
treef16d0a3985dc40ae8b5013ebeca1e7e188b1b530 /lib/action_cable/connection/base.rb
parent2b4aa9a173eeda96a8d827c5bdd9ad8e41e6abf1 (diff)
parent43c6c7787954d959347a1f90d71b11ba0cb7a8c7 (diff)
downloadrails-cf4d9aa992f99ca19fd32446d081ba7d145fbeae.tar.gz
rails-cf4d9aa992f99ca19fd32446d081ba7d145fbeae.tar.bz2
rails-cf4d9aa992f99ca19fd32446d081ba7d145fbeae.zip
Merge pull request #125 from lsylvester/handle-custom-loggers
Handle cases where logger is not a tagged logger.
Diffstat (limited to 'lib/action_cable/connection/base.rb')
-rw-r--r--lib/action_cable/connection/base.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index 6df168e4c3..b93b6a8a50 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -56,7 +56,7 @@ module ActionCable
def initialize(server, env)
@server, @env = server, env
- @logger = new_tagged_logger || server.logger
+ @logger = new_tagged_logger
@websocket = ActionCable::Connection::WebSocket.new(env)
@subscriptions = ActionCable::Connection::Subscriptions.new(self)
@@ -194,10 +194,8 @@ module ActionCable
# Tags are declared in the server but computed in the connection. This allows us per-connection tailored tags.
def new_tagged_logger
- if server.logger.respond_to?(:tagged)
- TaggedLoggerProxy.new server.logger,
- tags: server.config.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize }
- end
+ TaggedLoggerProxy.new server.logger,
+ tags: server.config.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize }
end
def started_request_message