diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-07-06 19:24:49 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-07-07 19:03:57 +0200 |
| commit | 53c4b4160a5298ca19ce6bc9c37acc0770a5d053 (patch) | |
| tree | bfd2e3d0a7099f8ba4187fc747e0729fdee3ac31 | |
| parent | 4c0ece2ff0ee39739aac2cd90b270bc2d40e5217 (diff) | |
| download | rails-53c4b4160a5298ca19ce6bc9c37acc0770a5d053.tar.gz rails-53c4b4160a5298ca19ce6bc9c37acc0770a5d053.tar.bz2 rails-53c4b4160a5298ca19ce6bc9c37acc0770a5d053.zip | |
Bundle connect/disconnect callbacks together with all other subscribe callbacks
| -rw-r--r-- | lib/action_cable/channel/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb index 335d2d9d7c..fc229c9f27 100644 --- a/lib/action_cable/channel/base.rb +++ b/lib/action_cable/channel/base.rb @@ -4,6 +4,9 @@ module ActionCable include Callbacks include Streams + on_subscribe :connect + on_unsubscribe :disconnect + on_subscribe :start_periodic_timers on_unsubscribe :stop_periodic_timers @@ -27,7 +30,6 @@ module ActionCable def perform_connection logger.info "#{channel_name} connecting" - connect run_subscribe_callbacks end @@ -47,7 +49,6 @@ module ActionCable end def perform_disconnection - disconnect run_unsubscribe_callbacks logger.info "#{channel_name} disconnected" end |