aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/server/configuration.rb
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-01-15 17:26:17 -0500
committerJon Moss <me@jonathanmoss.me>2016-01-18 18:59:28 -0500
commit75489642c8dcb4c75ccc14b909113a2828d6acb8 (patch)
treeb94be041abff3c62c4cb1381ab0dbdf63eb6f9be /actioncable/lib/action_cable/server/configuration.rb
parent78ff63ee4191758940ae8e0efaa5f9915af0a788 (diff)
downloadrails-75489642c8dcb4c75ccc14b909113a2828d6acb8.tar.gz
rails-75489642c8dcb4c75ccc14b909113a2828d6acb8.tar.bz2
rails-75489642c8dcb4c75ccc14b909113a2828d6acb8.zip
config_opts => cable, per @kaspth
Diffstat (limited to 'actioncable/lib/action_cable/server/configuration.rb')
-rw-r--r--actioncable/lib/action_cable/server/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index 2349f36198..c43928d898 100644
--- a/actioncable/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
@@ -7,7 +7,7 @@ module ActionCable
attr_accessor :connection_class, :worker_pool_size
attr_accessor :channels_path
attr_accessor :disable_request_forgery_protection, :allowed_request_origins
- attr_accessor :config_opts, :url
+ attr_accessor :cable, :url
def initialize
@log_tags = []
@@ -34,7 +34,7 @@ module ActionCable
# If the adapter cannot be found, this will default to the Redis adapter
def storage_adapter
# Defaults to redis if no adapter is set
- adapter = config_opts.fetch('adapter') { 'redis' }
+ adapter = cable.fetch('adapter') { 'redis' }
"ActionCable::StorageAdapter::#{adapter.camelize}".constantize
end
end