aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/subscription_adapter/redis.rb
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2017-09-28 21:54:00 -0700
committerJeremy Daer <jeremydaer@gmail.com>2017-10-08 15:37:54 -0700
commit53c516d88d48bafee5bd125a368352dd94f5fdad (patch)
treefcf21f1bd6ef63146964fbb530cc7700d0176e75 /actioncable/lib/action_cable/subscription_adapter/redis.rb
parentf165628cdf9a6d857ea6eeca02ed6c950b250df5 (diff)
downloadrails-53c516d88d48bafee5bd125a368352dd94f5fdad.tar.gz
rails-53c516d88d48bafee5bd125a368352dd94f5fdad.tar.bz2
rails-53c516d88d48bafee5bd125a368352dd94f5fdad.zip
redis-rb 4.0 support
* Use `gem 'redis', '~> 4.0'` for new app Gemfiles * Loosen Action Cable redis-rb dep to `>= 3.3, < 5` * Bump redis-namespace for looser Redis version dep * Avoid using the underlying `redis.client` directly * Use `Redis.new` instead of `Redis.connect`
Diffstat (limited to 'actioncable/lib/action_cable/subscription_adapter/redis.rb')
-rw-r--r--actioncable/lib/action_cable/subscription_adapter/redis.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/redis.rb b/actioncable/lib/action_cable/subscription_adapter/redis.rb
index facea944ff..c28951608f 100644
--- a/actioncable/lib/action_cable/subscription_adapter/redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/redis.rb
@@ -2,7 +2,7 @@
require "thread"
-gem "redis", "~> 3.0"
+gem "redis", ">= 3", "< 5"
require "redis"
module ActionCable
@@ -76,7 +76,7 @@ module ActionCable
def listen(conn)
conn.without_reconnect do
- original_client = conn.client
+ original_client = conn.respond_to?(:_client) ? conn._client : conn.client
conn.subscribe("_action_cable_internal") do |on|
on.subscribe do |chan, count|