Open Build Service

_service:tar_scm:rubygem-actioncable.spec Changed

_service:tar_scm:actioncable-7.0.4-app.txz Deleted

_service:tar_scm:actioncable-7.0.4-tests.txz Deleted

_service:tar_scm:actioncable-7.0.7-app.txz Added

_service:tar_scm:actioncable-7.0.7-tests.txz Added

_service:tar_scm:actioncable-7.0.4.gem/checksums.yaml.gz -> _service:tar_scm:actioncable-7.0.7.gem/checksums.yaml.gz Changed

_service:tar_scm:actioncable-7.0.4.gem/data/CHANGELOG.md -> _service:tar_scm:actioncable-7.0.7.gem/data/CHANGELOG.md Changed

_service:tar_scm:actioncable-7.0.4.gem/data/README.md -> _service:tar_scm:actioncable-7.0.7.gem/data/README.md Changed

_service:tar_scm:actioncable-7.0.4.gem/data/lib/action_cable/gem_version.rb -> _service:tar_scm:actioncable-7.0.7.gem/data/lib/action_cable/gem_version.rb Changed

_service:tar_scm:actioncable-7.0.4.gem/data/lib/action_cable/subscription_adapter/redis.rb -> _service:tar_scm:actioncable-7.0.7.gem/data/lib/action_cable/subscription_adapter/redis.rb Changed

@@ -46,7 +46,7 @@
 
       private
         def listener
-          @listener || @server.mutex.synchronize { @listener ||= Listener.new(self, @server.event_loop) }
+          @listener || @server.mutex.synchronize { @listener ||= Listener.new(self, config_options, @server.event_loop) }
         end
 
         def redis_connection_for_broadcasts
@@ -56,11 +56,15 @@
         end
 
         def redis_connection
-          self.class.redis_connector.call(@server.config.cable.symbolize_keys.merge(id: identifier))
+          self.class.redis_connector.call(config_options)
+        end
+
+        def config_options
+          @config_options ||= @server.config.cable.deep_symbolize_keys.merge(id: identifier)
         end
 
         class Listener < SubscriberMap
-          def initialize(adapter, event_loop)
+          def initialize(adapter, config_options, event_loop)
             super()
 
             @adapter = adapter
@@ -69,6 +73,11 @@
             @subscribe_callbacks = Hash.new { |h, k| h[k] = [] }
             @subscription_lock = Mutex.new
 
+            @reconnect_attempt = 0
+            # Use the same config as used by Redis conn
+            @reconnect_attempts = config_options.fetch(:reconnect_attempts, 1)
+            @reconnect_attempts = Array.new(@reconnect_attempts, 0) if @reconnect_attempts.is_a?(Integer)
+
             @subscribed_client = nil
 
             @when_connected = []
@@ -84,6 +93,7 @@
                 on.subscribe do |chan, count|
                   @subscription_lock.synchronize do
                     if count == 1
+                      @reconnect_attempt = 0
                       @subscribed_client = original_client
 
                       until @when_connected.empty?
@@ -150,8 +160,16 @@
               @thread ||= Thread.new do
                 Thread.current.abort_on_exception = true
 
-                conn = @adapter.redis_connection_for_subscriptions
-                listen conn
+                begin
+                  conn = @adapter.redis_connection_for_subscriptions
+                  listen conn
+                rescue ConnectionError
+                  reset
+                  if retry_connecting?
+                    when_connected { resubscribe }
+                    retry
+                  end
+                end
               end
             end
 
@@ -163,7 +181,36 @@
               end
             end
 
+            def retry_connecting?
+              @reconnect_attempt += 1
+
+              return false if @reconnect_attempt > @reconnect_attempts.size
+
+              sleep_t = @reconnect_attempts[@reconnect_attempt - 1]
+
+              sleep(sleep_t) if sleep_t > 0
+
+              true
+            end
+
+            def resubscribe
+              channels = @sync.synchronize do
+                @subscribers.keys
+              end
+              @subscribed_client.subscribe(*channels) unless channels.empty?
+            end
+
+            def reset
+              @subscription_lock.synchronize do
+                @subscribed_client = nil
+                @subscribe_callbacks.clear
+                @when_connected.clear
+              end
+            end
+
             if ::Redis::VERSION < "5"
+              ConnectionError = ::Redis::ConnectionError
+
               class SubscribedClient
                 def initialize(raw_client)
                   @raw_client = raw_client
@@ -197,6 +244,8 @@
                 SubscribedClient.new(raw_client)
               end
             else
+              ConnectionError = RedisClient::ConnectionError
+
               def extract_subscribed_client(conn)
                 conn
               end

_service:tar_scm:actioncable-7.0.4.gem/metadata.gz -> _service:tar_scm:actioncable-7.0.7.gem/metadata.gz Changed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.7
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2023-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,28 +17,28 @@
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 7.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 7.0.7
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 7.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 7.0.7
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -142,10 +142,10 @@
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.4/actioncable/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.4/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.7/actioncable/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.7/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.4/actioncable
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.7/actioncable
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -162,7 +162,7 @@
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: WebSocket framework for Rails.

_service:tar_scm:rails-7.0.4-tools.txz Deleted

_service:tar_scm:rails-7.0.7-tools.txz Added

_service:tar_scm:rubygem-actioncable-1674183343.440c447.tar Deleted

_service:tar_scm:rubygem-actioncable-1692349342.ac59fa9.tar Added

Changes of Revision 26