From d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sat, 1 Oct 2016 10:57:26 +0930
Subject: Remove Faye mode

No deprecation, because it was never documented.
---
 actioncable/lib/action_cable/connection.rb         |  2 -
 .../action_cable/connection/faye_client_socket.rb  | 48 ----------------------
 .../lib/action_cable/connection/faye_event_loop.rb | 44 --------------------
 .../lib/action_cable/server/configuration.rb       | 14 ++-----
 4 files changed, 3 insertions(+), 105 deletions(-)
 delete mode 100644 actioncable/lib/action_cable/connection/faye_client_socket.rb
 delete mode 100644 actioncable/lib/action_cable/connection/faye_event_loop.rb

(limited to 'actioncable/lib')

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/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/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index 7153593d4c..e46e5976ec 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
 
@@ -37,19 +37,11 @@ module ActionCable
       end
 
       def event_loop_class
-        if use_faye
-          ActionCable::Connection::FayeEventLoop
-        else
-          ActionCable::Connection::StreamEventLoop
-        end
+        ActionCable::Connection::StreamEventLoop
       end
 
       def client_socket_class
-        if use_faye
-          ActionCable::Connection::FayeClientSocket
-        else
-          ActionCable::Connection::ClientSocket
-        end
+        ActionCable::Connection::ClientSocket
       end
     end
   end
-- 
cgit v1.2.3