aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/server/configuration.rb
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-01-15 19:07:18 -0500
committerJon Moss <me@jonathanmoss.me>2016-01-18 18:59:30 -0500
commit4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b (patch)
tree63a2b21cdcf1a411d8babc260448fa0a32e0d266 /actioncable/lib/action_cable/server/configuration.rb
parent6aeaed4c1a370084e82c6712a32422a58dac8b8c (diff)
downloadrails-4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b.tar.gz
rails-4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b.tar.bz2
rails-4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b.zip
ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapter
Diffstat (limited to 'actioncable/lib/action_cable/server/configuration.rb')
-rw-r--r--actioncable/lib/action_cable/server/configuration.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index c43928d898..344ae0ad5d 100644
--- a/actioncable/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
@@ -30,12 +30,14 @@ module ActionCable
end
end
- # Returns constant of storage adapter specified in config/cable.yml
+ # Returns constant of subscription adapter specified in config/cable.yml
# If the adapter cannot be found, this will default to the Redis adapter
- def storage_adapter
+ def subscription_adapter
# Defaults to redis if no adapter is set
adapter = cable.fetch('adapter') { 'redis' }
- "ActionCable::StorageAdapter::#{adapter.camelize}".constantize
+ adapter.camelize
+ adapter = 'PostgreSQL' if adapter == 'Postgresql'
+ "ActionCable::SubscriptionAdapter::#{adapter}".constantize
end
end
end