solid_cable 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d0f5f6a07f329cf8365e30926b72879b22300fab4c7520d18c865dc184156a
-  data.tar.gz: 7e9bd94004f0111b403b31b30f9aa6eb489173f523af656a2db76f771fc7a7c0
+  metadata.gz: 10e383ae37ea3643b84e98e513c1123340c94db2d3c0d9683c6bbd1f86f6b3dc
+  data.tar.gz: b883a4c70ca58c0bada49bc4ee0b42e3cac9e5c4260c42a6a2ffb2ade678ee26
 SHA512:
-  metadata.gz: adc3ddc71a3033b4bea6fdd5cc94cf54ca29c39d527d763c0476cd0a99639f94fea18f7a4dd43729da1a20bcb179f900cc95167ac3ea3b95e7186dcd9b048e30
-  data.tar.gz: 96ac0c12361e6a9e39a1f5fe0c33975d437e3f6dc1e9038ddda243eef49390bf7078a03d7da7901a4b286f1bd3fc50d9a5edb3caf3877ab887af3ee51d238b64
+  metadata.gz: c7a8924daed8e0b78e9955bad3cc800f33bb917f0fab735ea1e892af037aa51f1e5ab64fc14f363d077f3ae748e977be192d36f42c86730119e1f21729dbc508
+  data.tar.gz: 412baa21c8913721f097d49ceeddc9b893634c3412936fd7f8b9bfbd1d454ed5343b2677a76c785aac6ef72cf8b8edb70bae23631fcc02622a72fdd4ee3bceb0

data/lib/action_cable/subscription_adapter/solid_cable.rb

@@ -12,6 +12,13 @@ module ActionCable
 
       def initialize(*)
         super
+        @mutex =
+          if defined?(@server)
+            @server.mutex
+          else
+            Mutex.new
+          end
+
         @listener = nil
       end
 
@@ -33,11 +40,20 @@ module ActionCable
 
       private
         def listener
-          @listener || @server.mutex.synchronize do
-            @listener ||= Listener.new(@server.event_loop)
+          @listener || @mutex.synchronize do
+            @listener ||= Listener.new(self, pubsub_executor)
           end
         end
 
+        def pubsub_executor
+          @pubsub_executor ||=
+            if respond_to?(:executor, true)
+              executor
+            else
+              @server.event_loop
+            end
+        end
+
         class Listener < ::ActionCable::SubscriptionAdapter::SubscriberMap
           CONNECTION_ERRORS = [
             ActiveRecord::ConnectionFailed,
@@ -46,10 +62,12 @@ module ActionCable
           ]
           Stop = Class.new(Exception)
 
-          def initialize(event_loop)
-            super()
+          delegate :logger, to: :@adapter
 
-            @event_loop = event_loop
+          def initialize(adapter, executor)
+            super()
+            @adapter = adapter
+            @executor = executor
 
             # Critical section begins with 0 permits. It can be understood as
             # being "normally held" by the listener thread. It is released
@@ -105,7 +123,7 @@ module ActionCable
 
           def add_channel(channel, on_success)
             channels[channel] = last_message_id
-            event_loop.post(&on_success) if on_success
+            on_success.call if on_success
           end
 
           def remove_channel(channel)
@@ -113,11 +131,11 @@ module ActionCable
           end
 
           def invoke_callback(*)
-            event_loop.post { super }
+            executor.post { super }
           end
 
           private
-            attr_reader :event_loop, :thread
+            attr_reader :executor, :thread
             attr_accessor :last_id, :reconnect_attempt
 
             def last_message_id
@@ -143,6 +161,7 @@ module ActionCable
                   end
 
                   broadcast(message.channel, message.payload) if should_broadcast_message
+                  self.reconnect_attempt = 0
                   self.last_id = message.id
                 end
             end

data/lib/solid_cable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidCable
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_cable
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Nick Pezza
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.15
 specification_version: 4
 summary: Database-backed Action Cable backend.
 test_files: []