diff options
author | Matthew Draper <matthew@trebex.net> | 2016-10-01 10:57:26 +0930 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2016-10-01 15:35:59 +0930 |
commit | d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22 (patch) | |
tree | 498ec595119ad2f9037e7d29c85e39ac51f43f12 /actioncable/test/stubs | |
parent | 9588a3d66d4ca6ba122d32417aa62680f441bf40 (diff) | |
download | rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.tar.gz rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.tar.bz2 rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.zip |
Remove Faye mode
No deprecation, because it was never documented.
Diffstat (limited to 'actioncable/test/stubs')
-rw-r--r-- | actioncable/test/stubs/test_server.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb index 02be72d0cb..4386cdcc70 100644 --- a/actioncable/test/stubs/test_server.rb +++ b/actioncable/test/stubs/test_server.rb @@ -10,12 +10,7 @@ class TestServer @logger = ActiveSupport::TaggedLogging.new ActiveSupport::Logger.new(StringIO.new) @config = OpenStruct.new(log_tags: [], subscription_adapter: subscription_adapter) - @config.use_faye = ENV["FAYE"].present? - @config.client_socket_class = if @config.use_faye - ActionCable::Connection::FayeClientSocket - else - ActionCable::Connection::ClientSocket - end + @config.client_socket_class = ActionCable::Connection::ClientSocket @mutex = Monitor.new end @@ -25,12 +20,8 @@ class TestServer end def event_loop - @event_loop ||= if @config.use_faye - ActionCable::Connection::FayeEventLoop.new - else - ActionCable::Connection::StreamEventLoop.new.tap do |loop| - loop.instance_variable_set(:@executor, Concurrent.global_io_executor) - end + @event_loop ||= ActionCable::Connection::StreamEventLoop.new.tap do |loop| + loop.instance_variable_set(:@executor, Concurrent.global_io_executor) end end |