diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2017-10-08 16:14:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 16:14:55 -0700 |
| commit | 5fb282239d8ece0eb14121eecfd5446d7aa70343 (patch) | |
| tree | 617dc1cade7c06cdb8fe3f2d5a55f3516b7b8911 /actioncable/lib/action_cable | |
| parent | 34d12d1483236f997125e2b1f17b96e76fdff99b (diff) | |
| parent | 53c516d88d48bafee5bd125a368352dd94f5fdad (diff) | |
| download | rails-5fb282239d8ece0eb14121eecfd5446d7aa70343.tar.gz rails-5fb282239d8ece0eb14121eecfd5446d7aa70343.tar.bz2 rails-5fb282239d8ece0eb14121eecfd5446d7aa70343.zip | |
Merge pull request #30748 from jeremy/redis-rb-4.0.1
redis-rb 4.0 support
Diffstat (limited to 'actioncable/lib/action_cable')
| -rw-r--r-- | actioncable/lib/action_cable/subscription_adapter/evented_redis.rb | 2 | ||||
| -rw-r--r-- | actioncable/lib/action_cable/subscription_adapter/redis.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb index 07774810ce..1227c793a9 100644 --- a/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb +++ b/actioncable/lib/action_cable/subscription_adapter/evented_redis.rb @@ -3,7 +3,7 @@ require "thread" gem "em-hiredis", "~> 0.3.0" -gem "redis", "~> 3.0" +gem "redis", ">= 3", "< 5" require "em-hiredis" require "redis" 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| |