aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/connection
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-21 19:49:31 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-21 19:49:31 +0200
commit890bee58f31ffe65e0127a8795c3432a18633013 (patch)
treee3cb35883f017ceb671e87b8063860eb2029520d /lib/action_cable/connection
parentb7ce9b652e2de0f724941b076078370e4c7590bc (diff)
downloadrails-890bee58f31ffe65e0127a8795c3432a18633013.tar.gz
rails-890bee58f31ffe65e0127a8795c3432a18633013.tar.bz2
rails-890bee58f31ffe65e0127a8795c3432a18633013.zip
Clarify that the incoming data is JSON
Diffstat (limited to 'lib/action_cable/connection')
-rw-r--r--lib/action_cable/connection/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index 32f6d0ae91..321a57fe44 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -64,9 +64,9 @@ module ActionCable
end
end
- def receive_data(data)
+ def receive_data(data_in_json)
if websocket_alive?
- data = ActiveSupport::JSON.decode data
+ data = ActiveSupport::JSON.decode data_in_json
case data['command']
when 'subscribe'