aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/server
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-10-01 10:57:26 +0930
committerMatthew Draper <matthew@trebex.net>2016-10-01 15:35:59 +0930
commitd44177d45e59ece7c2b8ed37bd2bfc23d28d7b22 (patch)
tree498ec595119ad2f9037e7d29c85e39ac51f43f12 /actioncable/lib/action_cable/server
parent9588a3d66d4ca6ba122d32417aa62680f441bf40 (diff)
downloadrails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.tar.gz
rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.tar.bz2
rails-d44177d45e59ece7c2b8ed37bd2bfc23d28d7b22.zip
Remove Faye mode
No deprecation, because it was never documented.
Diffstat (limited to 'actioncable/lib/action_cable/server')
-rw-r--r--actioncable/lib/action_cable/server/configuration.rb14
1 files changed, 3 insertions, 11 deletions
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