aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable
diff options
context:
space:
mode:
authorMarc Ignacio <marcrendlignacio@gmail.com>2017-06-22 09:10:08 +0800
committerMarc Ignacio <marcrendlignacio@gmail.com>2017-06-22 16:15:47 +0800
commitf55ecc6a7c7866a13fe9f5b84b295f2935c6ff1f (patch)
tree8df079fa2104fe88b0101cb8722f9c03b06afac9 /actioncable/lib/action_cable
parent95ee77b3aeed0eb9cbac22268b398a7917e536d3 (diff)
downloadrails-f55ecc6a7c7866a13fe9f5b84b295f2935c6ff1f.tar.gz
rails-f55ecc6a7c7866a13fe9f5b84b295f2935c6ff1f.tar.bz2
rails-f55ecc6a7c7866a13fe9f5b84b295f2935c6ff1f.zip
Allows for other common redis options to be in cable.yml, by default
- Adds RedisAdapterTest::AlternateConfiguration to account for a relatively common alternative setup, as it’s used as the first example in the [Redis rubygem](https://github.com/redis/redis-rb#getting-started) - Supplies original RedisAdapterTest with more complete redis:// url format by adding a ‘userinfo’ (blank user), so that it resembles the alternate configuration - Supplies original EventedRedisAdapterTest with more complete redis:// url as well - Adds before_script to start redis-server with password as a daemon and with explicit defaults copied from the default redis.conf (Instead of using Travis' default init/upstart scripts for `redis` service)
Diffstat (limited to 'actioncable/lib/action_cable')
-rw-r--r--actioncable/lib/action_cable/subscription_adapter/redis.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/redis.rb b/actioncable/lib/action_cable/subscription_adapter/redis.rb
index a31ed33bdb..225609c236 100644
--- a/actioncable/lib/action_cable/subscription_adapter/redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/redis.rb
@@ -10,7 +10,9 @@ module ActionCable
# Overwrite this factory method for redis connections if you want to use a different Redis library than Redis.
# This is needed, for example, when using Makara proxies for distributed Redis.
- cattr_accessor :redis_connector, default: ->(config) { ::Redis.new(url: config[:url]) }
+ cattr_accessor :redis_connector, default: ->(config) do
+ ::Redis.new(config.slice(:url, :host, :port, :db, :password))
+ end
def initialize(*)
super