From 9b8195b4b03e9ee70bde3072e364826f198d9fb2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 9 Feb 2015 21:22:21 -0800 Subject: Inline id_key variable --- lib/action_cable/server.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/action_cable') diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb index e657f6d636..96d21416bf 100644 --- a/lib/action_cable/server.rb +++ b/lib/action_cable/server.rb @@ -88,17 +88,14 @@ module ActionCable end def process_message(message) - id_key = message['identifier'] - - if @subscriptions[id_key] - @subscriptions[id_key].receive(ActiveSupport::JSON.decode message['data']) + if @subscriptions[message['identifier']] + @subscriptions[message['identifier']].receive(ActiveSupport::JSON.decode message['data']) end end def unsubscribe_channel(data) - id_key = data['identifier'] - @subscriptions[id_key].unsubscribe - @subscriptions.delete(id_key) + @subscriptions[data['identifier']].unsubscribe + @subscriptions.delete(data['identifier']) end def invalid_request -- cgit v1.2.3 From c0936fbf1f332a6fc2c68a1dc3f52b327e63f0b2 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 9 Feb 2015 21:22:32 -0800 Subject: Add logging --- lib/action_cable/server.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib/action_cable') diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb index 96d21416bf..8f72d2ca7b 100644 --- a/lib/action_cable/server.rb +++ b/lib/action_cable/server.rb @@ -6,6 +6,8 @@ module ActionCable class_attribute :worker_pool_size self.worker_pool_size = 100 + cattr_accessor(:logger, instance_reader: true) { Rails.logger } + class << self def register_channels(*channel_classes) self.registered_channels += channel_classes @@ -66,6 +68,7 @@ module ActionCable end def broadcast(data) + logger.info "Sending data: #{data}" @websocket.send data end @@ -81,19 +84,23 @@ module ActionCable subscription_klass = registered_channels.detect { |channel_klass| channel_klass.find_name == id_options[:channel] } if subscription_klass + logger.info "Subscribing to channel: #{id_key}" @subscriptions[id_key] = subscription_klass.new(self, id_key, id_options) else - # No channel found + logger.error "Unable to subscribe to channel: #{id_key}" end end def process_message(message) if @subscriptions[message['identifier']] @subscriptions[message['identifier']].receive(ActiveSupport::JSON.decode message['data']) + else + logger.error "Unable to process message: #{message}" end end def unsubscribe_channel(data) + logger.info "Unsubscribing from channel: #{data['identifier']}" @subscriptions[data['identifier']].unsubscribe @subscriptions.delete(data['identifier']) end -- cgit v1.2.3