aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-20 16:21:21 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-20 16:21:21 +0200
commit404867d332069d8b87547e1eae5ed1d0a7a1b95c (patch)
tree7921e221eaae98ab1d7161629fec1ab6ccdebcce
parent0e4c2df1e105871f3afa9503043a22489822110e (diff)
downloadrails-404867d332069d8b87547e1eae5ed1d0a7a1b95c.tar.gz
rails-404867d332069d8b87547e1eae5ed1d0a7a1b95c.tar.bz2
rails-404867d332069d8b87547e1eae5ed1d0a7a1b95c.zip
TOC order
-rw-r--r--lib/action_cable/channel/base.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index 6060ccf681..c39c2fcf0b 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -31,6 +31,12 @@ module ActionCable
perform_connection
end
+ def perform_connection
+ logger.info "#{channel_name} connecting"
+ connect
+ run_subscribe_callbacks
+ end
+
def perform_action(data)
if authorized?
action = extract_action(data)
@@ -52,11 +58,6 @@ module ActionCable
logger.info "#{channel_name} disconnected"
end
- def perform_connection
- logger.info "#{channel_name} connecting"
- connect
- run_subscribe_callbacks
- end
protected
# Override in subclasses