diff options
| -rw-r--r-- | lib/action_cable/channel/base.rb | 6 | ||||
| -rw-r--r-- | lib/action_cable/channel/redis.rb | 3 | ||||
| -rw-r--r-- | lib/action_cable/connection/base.rb | 10 |
3 files changed, 9 insertions, 10 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb index c39c2fcf0b..4c90849a06 100644 --- a/lib/action_cable/channel/base.rb +++ b/lib/action_cable/channel/base.rb @@ -79,10 +79,10 @@ module ActionCable end - def broadcast(data) + def transmit(data, via: nil) if authorized? - logger.info "#{channel_name} broadcasting #{data.inspect}" - connection.broadcast({ identifier: @channel_identifier, message: data }.to_json) + logger.info "#{channel_name} transmitting #{data.inspect} #{via}" + connection.transmit({ identifier: @channel_identifier, message: data }.to_json) else unauthorized end diff --git a/lib/action_cable/channel/redis.rb b/lib/action_cable/channel/redis.rb index b5fc812919..bdd6ab9dcf 100644 --- a/lib/action_cable/channel/redis.rb +++ b/lib/action_cable/channel/redis.rb @@ -29,8 +29,7 @@ module ActionCable protected def default_subscription_callback(channel) -> (message) do - logger.info "Received a message over the redis channel: #{channel}" - broadcast ActiveSupport::JSON.decode(message) + transmit ActiveSupport::JSON.decode(message), via: "incoming action from #{channel}" end end end diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb index d6e5bfa2d2..52f94a7ab0 100644 --- a/lib/action_cable/connection/base.rb +++ b/lib/action_cable/connection/base.rb @@ -34,8 +34,8 @@ module ActionCable @websocket = Faye::WebSocket.new(@env) @websocket.on(:open) do |event| - broadcast_ping_timestamp - @ping_timer = EventMachine.add_periodic_timer(PING_INTERVAL) { broadcast_ping_timestamp } + transmit_ping_timestamp + @ping_timer = EventMachine.add_periodic_timer(PING_INTERVAL) { transmit_ping_timestamp } worker_pool.async.invoke(self, :initialize_connection) end @@ -87,7 +87,7 @@ module ActionCable end end - def broadcast(data) + def transmit(data) @websocket.send data end @@ -127,8 +127,8 @@ module ActionCable disconnect if respond_to?(:disconnect) end - def broadcast_ping_timestamp - broadcast({ identifier: '_ping', message: Time.now.to_i }.to_json) + def transmit_ping_timestamp + transmit({ identifier: '_ping', message: Time.now.to_i }.to_json) end def subscribe_channel(data) |