diff options
Diffstat (limited to 'actioncable/lib/action_cable/connection')
4 files changed, 8 insertions, 4 deletions
diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb index 7e9eec7508..f7b18a85ae 100644 --- a/actioncable/lib/action_cable/connection/base.rb +++ b/actioncable/lib/action_cable/connection/base.rb @@ -62,6 +62,7 @@ module ActionCable @subscriptions = ActionCable::Connection::Subscriptions.new(self) @message_buffer = ActionCable::Connection::MessageBuffer.new(self) + @_internal_redis_subscriptions = nil @started_at = Time.now end @@ -138,10 +139,11 @@ module ActionCable end - private + protected attr_reader :websocket attr_reader :message_buffer + private def on_open connect if respond_to?(:connect) subscribe_to_internal_channel diff --git a/actioncable/lib/action_cable/connection/message_buffer.rb b/actioncable/lib/action_cable/connection/message_buffer.rb index 25cff75b41..2f65a1e84a 100644 --- a/actioncable/lib/action_cable/connection/message_buffer.rb +++ b/actioncable/lib/action_cable/connection/message_buffer.rb @@ -29,10 +29,11 @@ module ActionCable receive_buffered_messages end - private + protected attr_reader :connection attr_accessor :buffered_messages + private def valid?(message) message.is_a?(String) end diff --git a/actioncable/lib/action_cable/connection/subscriptions.rb b/actioncable/lib/action_cable/connection/subscriptions.rb index 6199db4898..65d6634bb0 100644 --- a/actioncable/lib/action_cable/connection/subscriptions.rb +++ b/actioncable/lib/action_cable/connection/subscriptions.rb @@ -58,9 +58,10 @@ module ActionCable subscriptions.each { |id, channel| channel.unsubscribe_from_channel } end + protected + attr_reader :connection, :subscriptions private - attr_reader :connection, :subscriptions delegate :logger, to: :connection def find(data) diff --git a/actioncable/lib/action_cable/connection/web_socket.rb b/actioncable/lib/action_cable/connection/web_socket.rb index 169b683b8c..670d5690ae 100644 --- a/actioncable/lib/action_cable/connection/web_socket.rb +++ b/actioncable/lib/action_cable/connection/web_socket.rb @@ -22,7 +22,7 @@ module ActionCable websocket.send data end - private + protected attr_reader :websocket end end |