diff options
author | Matthew Draper <matthew@trebex.net> | 2016-10-01 11:08:17 +0930 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-10-01 15:36:26 +0930 |
commit | 3e779d3c6743cf198af6a2c88fdc1762f258e761 (patch) | |
tree | a77f85ca03776a699a7885bacbfe88e2e4b25ad3 /actioncable/lib/action_cable/server | |
parent | d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22 (diff) | |
download | rails-3e779d3c6743cf198af6a2c88fdc1762f258e761.tar.gz rails-3e779d3c6743cf198af6a2c88fdc1762f258e761.tar.bz2 rails-3e779d3c6743cf198af6a2c88fdc1762f258e761.zip |
In-line the configuration points that only existed for Faye support
Diffstat (limited to 'actioncable/lib/action_cable/server')
-rw-r--r-- | actioncable/lib/action_cable/server/base.rb | 2 | ||||
-rw-r--r-- | actioncable/lib/action_cable/server/configuration.rb | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/actioncable/lib/action_cable/server/base.rb b/actioncable/lib/action_cable/server/base.rb index dd059a553b..67ada7cc2e 100644 --- a/actioncable/lib/action_cable/server/base.rb +++ b/actioncable/lib/action_cable/server/base.rb @@ -49,7 +49,7 @@ module ActionCable end def event_loop - @event_loop || @mutex.synchronize { @event_loop ||= config.event_loop_class.new } + @event_loop || @mutex.synchronize { @event_loop ||= ActionCable::Connection::StreamEventLoop.new } end # The worker pool is where we run connection callbacks and channel actions. We do as little as possible on the server's main thread. diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb index e46e5976ec..dc146f07b0 100644 --- a/actioncable/lib/action_cable/server/configuration.rb +++ b/actioncable/lib/action_cable/server/configuration.rb @@ -35,14 +35,6 @@ module ActionCable adapter = "PostgreSQL" if adapter == "Postgresql" "ActionCable::SubscriptionAdapter::#{adapter}".constantize end - - def event_loop_class - ActionCable::Connection::StreamEventLoop - end - - def client_socket_class - ActionCable::Connection::ClientSocket - end end end end |