Merge pull request rails#54931 from bubiche/main

Action Cable: Allow setting nil as subscription connection identifier for Redis

Author: byroot

actioncable/CHANGELOG.md

@@ -1,2 +1,5 @@
+*   Allow setting nil as subscription connection identifier for Redis.
+
+    *Nguyen Nguyen*
 
 Please check [8-0-stable](https://github.com/rails/rails/blob/8-0-stable/actioncable/CHANGELOG.md) for previous changes.

actioncable/lib/action_cable/subscription_adapter/base.rb

@@ -29,7 +29,8 @@ def shutdown
       end
 
       def identifier
-        @server.config.cable[:id] ||= "ActionCable-PID-#{$$}"
+        @server.config.cable[:id] = "ActionCable-PID-#{$$}" unless @server.config.cable.key?(:id)
+        @server.config.cable[:id]
       end
     end
   end

actioncable/test/subscription_adapter/redis_test.rb

@@ -113,6 +113,16 @@ def connection_id
   end
 end
 
+class RedisAdapterTest::ConnectorCustomIDNil < RedisAdapterTest::ConnectorDefaultID
+  def cable_config
+    super.merge(id: connection_id)
+  end
+
+  def connection_id
+    nil
+  end
+end
+
 class RedisAdapterTest::ConnectorWithExcluded < RedisAdapterTest::ConnectorDefaultID
   def cable_config
     super.merge(adapter: "redis", channel_prefix: "custom")