diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-05 09:12:55 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-05 09:26:11 -0700 |
| commit | fa3537506a12635b51886919589211640ddd3a15 (patch) | |
| tree | 2774b5ac7e58d63284a05ea33bfc1a9242a6edc5 /actioncable/lib/action_cable/connection/base.rb | |
| parent | fca51a7c031b4f17f7a2f353fcfc8a748f6ada7f (diff) | |
| parent | cbd15da0274316bae64caae54880fee87853f480 (diff) | |
| download | rails-fa3537506a12635b51886919589211640ddd3a15.tar.gz rails-fa3537506a12635b51886919589211640ddd3a15.tar.bz2 rails-fa3537506a12635b51886919589211640ddd3a15.zip | |
Merge pull request #24224 from danielrhodes/actioncable-websocket-protocols
ActionCable protocol negotiation
Diffstat (limited to 'actioncable/lib/action_cable/connection/base.rb')
| -rw-r--r-- | actioncable/lib/action_cable/connection/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb index 604a889bb0..9a7dfbe761 100644 --- a/actioncable/lib/action_cable/connection/base.rb +++ b/actioncable/lib/action_cable/connection/base.rb @@ -48,7 +48,7 @@ module ActionCable include InternalChannel include Authorization - attr_reader :server, :env, :subscriptions, :logger, :worker_pool + attr_reader :server, :env, :subscriptions, :logger, :worker_pool, :protocol delegate :event_loop, :pubsub, to: :server def initialize(server, env, coder: ActiveSupport::JSON) @@ -163,6 +163,7 @@ module ActionCable end def handle_open + @protocol = websocket.protocol connect if respond_to?(:connect) subscribe_to_internal_channel send_welcome_message |