1 files changed, 16 insertions, 10 deletions
diff --git a/actioncable/lib/action_cable/subscription_adapter/redis.rb b/actioncable/lib/action_cable/subscription_adapter/redis.rb
index 65434f7107..c28951608f 100644
--- a/actioncable/lib/action_cable/subscription_adapter/redis.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/redis.rb
@@ -1,14 +1,20 @@
-require 'thread'
+# frozen_string_literal: true
 
-gem 'redis', '~> 3.0'
-require 'redis'
+require "thread"
+
+gem "redis", ">= 3", "< 5"
+require "redis"
 
 module ActionCable
   module SubscriptionAdapter
     class Redis < Base # :nodoc:
-      # Overwrite this factory method for redis connections if you want to use a different Redis library than Redis.
+      prepend ChannelPrefix
+
+      # Overwrite this factory method for Redis connections if you want to use a different Redis library than the redis gem.
       # This is needed, for example, when using Makara proxies for distributed Redis.
-      cattr_accessor(:redis_connector) { ->(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
@@ -70,9 +76,9 @@ 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|
+              conn.subscribe("_action_cable_internal") do |on|
                 on.subscribe do |chan, count|
                   @subscription_lock.synchronize do
                     if count == 1
@@ -111,7 +117,7 @@ module ActionCable
               return if @thread.nil?
 
               when_connected do
-                send_command('unsubscribe')
+                send_command("unsubscribe")
                 @raw_client = nil
               end
             end
@@ -123,13 +129,13 @@ module ActionCable
             @subscription_lock.synchronize do
               ensure_listener_running
               @subscribe_callbacks[channel] << on_success
-              when_connected { send_command('subscribe', channel) }
+              when_connected { send_command("subscribe", channel) }
             end
           end
 
           def remove_channel(channel)
             @subscription_lock.synchronize do
-              when_connected { send_command('unsubscribe', channel) }
+              when_connected { send_command("unsubscribe", channel) }
             end
           end