aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/connection
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-19 18:55:35 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-19 18:55:35 +0200
commit471ba41fddeff19f04f8d29bfe0df3c3f497407a (patch)
tree921c7917378e5d4ac06072ab98a310d7ca40f51f /lib/action_cable/connection
parent2b41ede6f8af2c69296478777babb5617d33b867 (diff)
downloadrails-471ba41fddeff19f04f8d29bfe0df3c3f497407a.tar.gz
rails-471ba41fddeff19f04f8d29bfe0df3c3f497407a.tar.bz2
rails-471ba41fddeff19f04f8d29bfe0df3c3f497407a.zip
Free up subscribe/unsubscribe as action names the user can use in their channels
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 ee1fe51529..fff6fd46a6 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -81,7 +81,7 @@ module ActionCable
def cleanup_subscriptions
@subscriptions.each do |id, channel|
- channel.unsubscribe
+ channel.run_unsubscribe_callbacks
end
end
@@ -161,7 +161,7 @@ module ActionCable
def unsubscribe_channel(data)
logger.info "Unsubscribing from channel: #{data['identifier']}"
- @subscriptions[data['identifier']].unsubscribe
+ @subscriptions[data['identifier']].run_unsubscribe_callbacks
@subscriptions.delete(data['identifier'])
end