diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-02 11:20:19 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-02 12:17:15 +1030 |
| commit | a373be9da45d4bee684ea03420212780ec1ef4b1 (patch) | |
| tree | 3798c6117d8944189c84bd5363d49dbf935ea407 /actioncable/lib/action_cable/connection/base.rb | |
| parent | 541e4abb4b3710a384aefac83cafd0ab878c60bf (diff) | |
| download | rails-a373be9da45d4bee684ea03420212780ec1ef4b1.tar.gz rails-a373be9da45d4bee684ea03420212780ec1ef4b1.tar.bz2 rails-a373be9da45d4bee684ea03420212780ec1ef4b1.zip | |
Support faye-websocket + EventMachine as an option
Diffstat (limited to 'actioncable/lib/action_cable/connection/base.rb')
| -rw-r--r-- | actioncable/lib/action_cable/connection/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb index afe0d958d7..7e7e777eaa 100644 --- a/actioncable/lib/action_cable/connection/base.rb +++ b/actioncable/lib/action_cable/connection/base.rb @@ -49,7 +49,7 @@ module ActionCable include Authorization attr_reader :server, :env, :subscriptions, :logger, :worker_pool - delegate :stream_event_loop, :pubsub, to: :server + delegate :event_loop, :pubsub, to: :server def initialize(server, env) @server, @env = server, env @@ -57,7 +57,7 @@ module ActionCable @worker_pool = server.worker_pool @logger = new_tagged_logger - @websocket = ActionCable::Connection::WebSocket.new(env, self, stream_event_loop) + @websocket = ActionCable::Connection::WebSocket.new(env, self, event_loop, server.config.client_socket_class) @subscriptions = ActionCable::Connection::Subscriptions.new(self) @message_buffer = ActionCable::Connection::MessageBuffer.new(self) |