Merge pull request rails#55359 from byroot/actioncable-redis-5.4.1-compat

Fix Action Cable compatibility with redis-rb 5.4.1

Author: byroot

Gemfile.lock

@@ -473,9 +473,9 @@ GEM
     rdoc (6.9.1)
       psych (>= 4.0.0)
     redcarpet (3.6.1)
-    redis (5.3.0)
+    redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.24.0)
+    redis-client (0.25.1)
       connection_pool
     redis-namespace (1.11.0)
       redis (>= 4)

actioncable/lib/action_cable/subscription_adapter/redis.rb

@@ -164,7 +164,7 @@ def ensure_listener_running
                 begin
                   conn = @adapter.redis_connection_for_subscriptions
                   listen conn
-                rescue ConnectionError
+                rescue *CONNECTION_ERRORS
                   reset
                   if retry_connecting?
                     when_connected { resubscribe }
@@ -210,7 +210,7 @@ def reset
             end
 
             if ::Redis::VERSION < "5"
-              ConnectionError = ::Redis::BaseConnectionError
+              CONNECTION_ERRORS = [::Redis::BaseConnectionError].freeze
 
               class SubscribedClient
                 def initialize(raw_client)
@@ -244,7 +244,12 @@ def extract_subscribed_client(conn)
                 SubscribedClient.new(conn._client)
               end
             else
-              ConnectionError = RedisClient::ConnectionError
+              CONNECTION_ERRORS = [
+                ::Redis::BaseConnectionError,
+
+                # Some older versions of redis-rb sometime leak underlying exceptions
+                RedisClient::ConnectionError,
+              ].freeze
 
               def extract_subscribed_client(conn)
                 conn