From fdbf759ac56eea40765bd2d45eaf9453011b5bd3 Mon Sep 17 00:00:00 2001
From: Alex Peattie <alexpeattie@gmail.com>
Date: Tue, 6 Oct 2015 19:59:27 +0100
Subject: Fix NoMethodError when using a custom Rails.logger class
---
lib/action_cable/connection/base.rb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'lib/action_cable')
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index 08a75156a3..84393845c4 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
+ @logger = new_tagged_logger || server.logger
@websocket = ActionCable::Connection::WebSocket.new(env)
@heartbeat = ActionCable::Connection::Heartbeat.new(self)
@@ -177,8 +177,10 @@ module ActionCable
# Tags are declared in the server but computed in the connection. This allows us per-connection tailored tags.
def new_tagged_logger
- TaggedLoggerProxy.new server.logger,
- tags: server.config.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize }
+ 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
end
def started_request_message
--
cgit v1.2.3