diff options
Diffstat (limited to 'lib/action_cable/connection')
| -rw-r--r-- | lib/action_cable/connection/base.rb | 2 | ||||
| -rw-r--r-- | lib/action_cable/connection/subscriptions.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb index 69c0db9167..09bbc73e2d 100644 --- a/lib/action_cable/connection/base.rb +++ b/lib/action_cable/connection/base.rb @@ -117,7 +117,7 @@ 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.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize } + tags: server.config.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize } end def started_request_message diff --git a/lib/action_cable/connection/subscriptions.rb b/lib/action_cable/connection/subscriptions.rb index 24ab1bdfbf..800474eee5 100644 --- a/lib/action_cable/connection/subscriptions.rb +++ b/lib/action_cable/connection/subscriptions.rb @@ -22,8 +22,8 @@ module ActionCable id_key = data['identifier'] id_options = ActiveSupport::JSON.decode(id_key).with_indifferent_access - subscription_klass = connection.server.registered_channels.detect do |channel_klass| - channel_klass == id_options[:channel].safe_constantize + subscription_klass = connection.server.channel_classes.detect do |channel_class| + channel_class == id_options[:channel].safe_constantize end if subscription_klass |