diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-27 13:21:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 13:21:02 -0400 |
| commit | 1eaed91b122f3c525fa51c955f409038e2804b91 (patch) | |
| tree | 8a20604ea3fd11e2b349e9bc8e7296b4683bd63e /actioncable/lib/action_cable/subscription_adapter/redis.rb | |
| parent | 200b01ca413a43b0f874c81bc02024c1b6f0d7fc (diff) | |
| parent | d7252786f4e133304b3d05966497272a2da9e098 (diff) | |
| download | rails-1eaed91b122f3c525fa51c955f409038e2804b91.tar.gz rails-1eaed91b122f3c525fa51c955f409038e2804b91.tar.bz2 rails-1eaed91b122f3c525fa51c955f409038e2804b91.zip | |
Merge pull request #29528 from padi/actioncable_redis_alt_config_with_password
Allows for other common redis options to be in cable.yml, by default
Diffstat (limited to 'actioncable/lib/action_cable/subscription_adapter/redis.rb')
| -rw-r--r-- | actioncable/lib/action_cable/subscription_adapter/redis.rb | 4 |
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 |