Merge pull request #26676 from matthewd/no-faye-mode

Remove Faye mode

15 files changed, 8 insertions, 185 deletions

diff --git a/.travis.yml b/.travis.yml
index f01b58ecb3..8bebd3f484 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,9 +36,7 @@ env:
     - "GEM=railties"
     - "GEM=ap"
     - "GEM=ac"
-    - "GEM=ac FAYE=1"
     - "GEM=ac:integration"
-    - "GEM=ac:integration FAYE=1"
     - "GEM=am,amo,as,av,aj"
     - "GEM=as PRESERVE_TIMEZONES=1"
     - "GEM=ar:mysql2"
@@ -69,7 +67,6 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-9.0.5.0
     - env: "GEM=ac:integration"
-    - env: "GEM=ac:integration FAYE=1"
   fast_finish: true
 
 notifications:
diff --git a/Rakefile b/Rakefile
index 3bc4cd19fb..202eb5e6fc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,9 +23,6 @@ task default: %w(test test:isolated)
     FRAMEWORKS.each do |project|
       system(%(cd #{project} && #{$0} #{task_name} --trace)) || errors << project
     end
-    if task_name =~ /test/
-      system(%(cd actioncable && env FAYE=1 #{$0} #{task_name} --trace)) || errors << "actioncable-faye"
-    end
     fail("Errors in #{errors.join(', ')}") unless errors.empty?
   end
 end
@@ -36,7 +33,6 @@ task :smoke do
     system %(cd #{project} && #{$0} test:isolated --trace)
   end
   system %(cd activerecord && #{$0} sqlite3:isolated_test --trace)
-  system %(cd actioncable && env FAYE=1 #{$0} test:isolated --trace)
 end
 
 desc "Install gems for all projects."
diff --git a/actioncable/lib/action_cable/connection.rb b/actioncable/lib/action_cable/connection.rb
index 5f813cf8e0..902efb07e2 100644
--- a/actioncable/lib/action_cable/connection.rb
+++ b/actioncable/lib/action_cable/connection.rb
@@ -8,8 +8,6 @@ module ActionCable
       autoload :ClientSocket
       autoload :Identification
       autoload :InternalChannel
-      autoload :FayeClientSocket
-      autoload :FayeEventLoop
       autoload :MessageBuffer
       autoload :Stream
       autoload :StreamEventLoop
diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb
index 4c7fcc1434..06f4f5edd3 100644
--- a/actioncable/lib/action_cable/connection/base.rb
+++ b/actioncable/lib/action_cable/connection/base.rb
@@ -57,7 +57,7 @@ module ActionCable
         @worker_pool = server.worker_pool
         @logger = new_tagged_logger
 
-        @websocket      = ActionCable::Connection::WebSocket.new(env, self, event_loop, server.config.client_socket_class)
+        @websocket      = ActionCable::Connection::WebSocket.new(env, self, event_loop)
         @subscriptions  = ActionCable::Connection::Subscriptions.new(self)
         @message_buffer = ActionCable::Connection::MessageBuffer.new(self)
 
diff --git a/actioncable/lib/action_cable/connection/faye_client_socket.rb b/actioncable/lib/action_cable/connection/faye_client_socket.rb
deleted file mode 100644
index 06e92c5d52..0000000000
--- a/actioncable/lib/action_cable/connection/faye_client_socket.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require "faye/websocket"
-
-module ActionCable
-  module Connection
-    class FayeClientSocket
-      def initialize(env, event_target, stream_event_loop, protocols)
-        @env = env
-        @event_target = event_target
-        @protocols = protocols
-
-        @faye = nil
-      end
-
-      def alive?
-        @faye && @faye.ready_state == Faye::WebSocket::API::OPEN
-      end
-
-      def transmit(data)
-        connect
-        @faye.send data
-      end
-
-      def close
-        @faye && @faye.close
-      end
-
-      def protocol
-        @faye && @faye.protocol
-      end
-
-      def rack_response
-        connect
-        @faye.rack_response
-      end
-
-      private
-        def connect
-          return if @faye
-          @faye = Faye::WebSocket.new(@env, @protocols)
-
-          @faye.on(:open)    { |event| @event_target.on_open }
-          @faye.on(:message) { |event| @event_target.on_message(event.data) }
-          @faye.on(:close)   { |event| @event_target.on_close(event.reason, event.code) }
-          @faye.on(:error)   { |event| @event_target.on_error(event.message) }
-        end
-    end
-  end
-end
diff --git a/actioncable/lib/action_cable/connection/faye_event_loop.rb b/actioncable/lib/action_cable/connection/faye_event_loop.rb
deleted file mode 100644
index cfbe26ee6a..0000000000
--- a/actioncable/lib/action_cable/connection/faye_event_loop.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-require "thread"
-
-require "eventmachine"
-EventMachine.epoll  if EventMachine.epoll?
-EventMachine.kqueue if EventMachine.kqueue?
-
-module ActionCable
-  module Connection
-    class FayeEventLoop
-      @@mutex = Mutex.new
-
-      def timer(interval, &block)
-        ensure_reactor_running
-        EMTimer.new(::EM::PeriodicTimer.new(interval, &block))
-      end
-
-      def post(task = nil, &block)
-        task ||= block
-
-        ensure_reactor_running
-        ::EM.next_tick(&task)
-      end
-
-      private
-        def ensure_reactor_running
-          return if EventMachine.reactor_running?
-          @@mutex.synchronize do
-            Thread.new { EventMachine.run } unless EventMachine.reactor_running?
-            Thread.pass until EventMachine.reactor_running?
-          end
-        end
-
-        class EMTimer
-          def initialize(inner)
-            @inner = inner
-          end
-
-          def shutdown
-            @inner.cancel
-          end
-        end
-    end
-  end
-end
diff --git a/actioncable/lib/action_cable/connection/web_socket.rb b/actioncable/lib/action_cable/connection/web_socket.rb
index 52d8daad4b..382141b89f 100644
--- a/actioncable/lib/action_cable/connection/web_socket.rb
+++ b/actioncable/lib/action_cable/connection/web_socket.rb
@@ -4,8 +4,8 @@ module ActionCable
   module Connection
     # Wrap the real socket to minimize the externally-presented API
     class WebSocket
-      def initialize(env, event_target, event_loop, client_socket_class, protocols: ActionCable::INTERNAL[:protocols])
-        @websocket = ::WebSocket::Driver.websocket?(env) ? client_socket_class.new(env, event_target, event_loop, protocols) : nil
+      def initialize(env, event_target, event_loop, protocols: ActionCable::INTERNAL[:protocols])
+        @websocket = ::WebSocket::Driver.websocket?(env) ? ClientSocket.new(env, event_target, event_loop, protocols) : nil
       end
 
       def possible?
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 7153593d4c..dc146f07b0 100644
--- a/actioncable/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
@@ -4,7 +4,7 @@ module ActionCable
     # in a Rails config initializer.
     class Configuration
       attr_accessor :logger, :log_tags
-      attr_accessor :use_faye, :connection_class, :worker_pool_size
+      attr_accessor :connection_class, :worker_pool_size
       attr_accessor :disable_request_forgery_protection, :allowed_request_origins
       attr_accessor :cable, :url, :mount_path
 
@@ -35,22 +35,6 @@ module ActionCable
         adapter = "PostgreSQL" if adapter == "Postgresql"
         "ActionCable::SubscriptionAdapter::#{adapter}".constantize
       end
-
-      def event_loop_class
-        if use_faye
-          ActionCable::Connection::FayeEventLoop
-        else
-          ActionCable::Connection::StreamEventLoop
-        end
-      end
-
-      def client_socket_class
-        if use_faye
-          ActionCable::Connection::FayeClientSocket
-        else
-          ActionCable::Connection::ClientSocket
-        end
-      end
     end
   end
 end
diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb
index 2e3821828f..9f97e08f1f 100644
--- a/actioncable/test/client_test.rb
+++ b/actioncable/test/client_test.rb
@@ -39,7 +39,6 @@ class ClientTest < ActionCable::TestCase
     server.config.logger = Logger.new(StringIO.new).tap { |l| l.level = Logger::UNKNOWN }
 
     server.config.cable = ActiveSupport::HashWithIndifferentAccess.new(adapter: "async")
-    server.config.use_faye = ENV["FAYE"].present?
 
     # and now the "real" setup for our test:
     server.config.disable_request_forgery_protection = true
diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb
index 5043a63370..dff7fefbfb 100644
--- a/actioncable/test/connection/client_socket_test.rb
+++ b/actioncable/test/connection/client_socket_test.rb
@@ -33,8 +33,6 @@ class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
   end
 
   test "delegate socket errors to on_error handler" do
-    skip if ENV["FAYE"].present?
-
     run_in_eventmachine do
       connection = open_connection
 
@@ -49,8 +47,6 @@ class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
   end
 
   test "closes hijacked i/o socket at shutdown" do
-    skip if ENV["FAYE"].present?
-
     run_in_eventmachine do
       connection = open_connection
 
diff --git a/actioncable/test/connection/stream_test.rb b/actioncable/test/connection/stream_test.rb
index 4128b32f15..36e1d3c095 100644
--- a/actioncable/test/connection/stream_test.rb
+++ b/actioncable/test/connection/stream_test.rb
@@ -34,8 +34,6 @@ class ActionCable::Connection::StreamTest < ActionCable::TestCase
 
   [ EOFError, Errno::ECONNRESET ].each do |closed_exception|
     test "closes socket on #{closed_exception}" do
-      skip if ENV["FAYE"].present?
-
       run_in_eventmachine do
         connection = open_connection
 
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index 02be72d0cb..5bf2a151dc 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -10,12 +10,6 @@ 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
 
     @mutex = Monitor.new
   end
@@ -25,12 +19,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
 
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 1538157995..ee62b9c088 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -11,7 +11,6 @@ module CommonSubscriptionAdapterTest
   def setup
     server = ActionCable::Server::Base.new
     server.config.cable = cable_config.with_indifferent_access
-    server.config.use_faye = ENV["FAYE"].present?
 
     adapter_klass = server.config.pubsub_adapter
 
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
index af3c7eee1d..a47032753b 100644
--- a/actioncable/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
@@ -13,41 +13,7 @@ end
 # Require all the stubs and models
 Dir[File.dirname(__FILE__) + "/stubs/*.rb"].each { |file| require file }
 
-if ENV["FAYE"].present?
-  require "faye/websocket"
-  class << Faye::WebSocket
-    remove_method :ensure_reactor_running
-
-    # We don't want Faye to start the EM reactor in tests because it makes testing much harder.
-    # We want to be able to start and stop EM loop in tests to make things simpler.
-    def ensure_reactor_running
-      # no-op
-    end
-  end
-end
-
-module EventMachineConcurrencyHelpers
-  def wait_for_async
-    EM.run_deferred_callbacks
-  end
-
-  def run_in_eventmachine
-    failure = nil
-    EM.run do
-      begin
-        yield
-      rescue => ex
-        failure = ex
-      ensure
-        wait_for_async
-        EM.stop if EM.reactor_running?
-      end
-    end
-    raise failure if failure
-  end
-end
-
-module ConcurrentRubyConcurrencyHelpers
+class ActionCable::TestCase < ActiveSupport::TestCase
   def wait_for_async
     wait_for_executor Concurrent.global_io_executor
   end
@@ -56,14 +22,6 @@ module ConcurrentRubyConcurrencyHelpers
     yield
     wait_for_async
   end
-end
-
-class ActionCable::TestCase < ActiveSupport::TestCase
-  if ENV["FAYE"].present?
-    include EventMachineConcurrencyHelpers
-  else
-    include ConcurrentRubyConcurrencyHelpers
-  end
 
   def wait_for_executor(executor)
     # do not wait forever, wait 2s