aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/connection/internal_channel.rb
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2016-03-31 07:08:49 -0700
committerJeremy Daer <jeremydaer@gmail.com>2016-03-31 07:08:49 -0700
commit9a83ef38912063db127a3918b0f155d5d3acfe3b (patch)
treee6225bc33dcc1dcefdfefca4537bde07bc8df94a /actioncable/lib/action_cable/connection/internal_channel.rb
parent903f447e436a7c909c3afc552f27bbbc1b4770c8 (diff)
parentb168eb5819fa5fea940c9865d5c9a3ec5ba2a7ec (diff)
downloadrails-9a83ef38912063db127a3918b0f155d5d3acfe3b.tar.gz
rails-9a83ef38912063db127a3918b0f155d5d3acfe3b.tar.bz2
rails-9a83ef38912063db127a3918b0f155d5d3acfe3b.zip
Merge pull request #24233 from jeremy/cable/encoding
Cable message encoding
Diffstat (limited to 'actioncable/lib/action_cable/connection/internal_channel.rb')
-rw-r--r--actioncable/lib/action_cable/connection/internal_channel.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actioncable/lib/action_cable/connection/internal_channel.rb b/actioncable/lib/action_cable/connection/internal_channel.rb
index 3c5d39f59a..f70d52f99b 100644
--- a/actioncable/lib/action_cable/connection/internal_channel.rb
+++ b/actioncable/lib/action_cable/connection/internal_channel.rb
@@ -11,7 +11,7 @@ module ActionCable
def subscribe_to_internal_channel
if connection_identifier.present?
- callback = -> (message) { process_internal_message(message) }
+ callback = -> (message) { process_internal_message decode(message) }
@_internal_subscriptions ||= []
@_internal_subscriptions << [ internal_channel, callback ]
@@ -27,8 +27,6 @@ module ActionCable
end
def process_internal_message(message)
- message = ActiveSupport::JSON.decode(message)
-
case message['type']
when 'disconnect'
logger.info "Removing connection (#{connection_identifier})"