event_store_subscriptions 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f261c1fb47c48ba5354b9d02c1b1a066e64813e397933657bbb75c396ec06f85
-  data.tar.gz: ce40a5265ba3d2bc34f4392cae838df08a471c13c85bbecc292dd53628cf464f
+  metadata.gz: a7e6e16c2a7382f97ae35a90701acbcd6d1ddbb76f3de3d8d91fb4f5a5970301
+  data.tar.gz: 297942167731aa297bd5d1d036cba81fc8a5b2f050abc5a46c2918ffe43260c3
 SHA512:
-  metadata.gz: 97ce25b1bbcd50a345b2be4ed7f1b98048f540732a91eafff55d36c31d6d513ad759614938dba6a07139a448d0e2c3b35bdfc1bb1e96b77ee2de51643b07b84d
-  data.tar.gz: 995f4264d8a301b8dae0156ab0d08fbe3ca41744194b4357e6fddba9d29b73deec207d98d6c9859fad8f5cbc41e3204580c163d76b61e8f8ea4e92c814ab8ded
+  metadata.gz: f5425d9761f330cd9cbabf2b19947709cb75cfecb7a604015fc6c1a8f768ebc97d9d35d87191e14706db7f9bfe2b79fce2a39608cca004116333f80ea7356d95
+  data.tar.gz: b3e1c417218056c29a85ef135a270296e2683258cc57b49bc19c7e12a7949b8aac2076fc9aa45fbd6c1bc69c4809a77b89b56c68bc91467a6d39a89c0f7228b3

data/lib/event_store_subscriptions/make_atomic.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module EventStoreSubscriptions
+  module MakeAtomic
+    # Wraps method in Mutex#synchronize to make it atomic. You should have #semaphore method
+    # implemented in order this to work.
+    # @param method [Symbol] a name of the method
+    # @return [Symbol]
+    def make_atomic(method)
+      module_to_prepend = Module.new do
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method}(*args, **kwargs, &blk)
+          semaphore.synchronize do
+            super
+          end
+        end
+        RUBY
+      end
+      prepend module_to_prepend
+      method
+    end
+  end
+end

data/lib/event_store_subscriptions/object_state.rb

@@ -10,7 +10,6 @@ module EventStoreSubscriptions
     STATES = %i(initial running halting stopped dead).freeze
 
     def initialize
-      @semaphore = Thread::Mutex.new
       initial!
     end
 
@@ -18,13 +17,13 @@ module EventStoreSubscriptions
       # Checks whether the object is in appropriate state
       # @return [Boolean]
       define_method "#{state}?" do
-        semaphore.synchronize { self.state == state }
+        self.state == state
       end
 
       # Sets the state.
       # @return [Symbol]
       define_method "#{state}!" do
-        semaphore.synchronize { self.state = state }
+        self.state = state
       end
     end
 

data/lib/event_store_subscriptions/subscription.rb

@@ -3,11 +3,12 @@
 module EventStoreSubscriptions
   class Subscription
     include WaitForFinish
+    extend MakeAtomic
 
     FORCED_SHUTDOWN_DELAY = 60 # seconds
 
     attr_accessor :runner
-    attr_reader :client, :setup, :state, :position, :statistic
+    attr_reader :client, :setup, :state, :position, :statistic, :semaphore
     private :runner, :runner=
 
     # @param position [EventStoreSubscriptions::SubscriptionPosition, EventStoreSubscriptions::SubscriptionRevision]
@@ -21,36 +22,19 @@ module EventStoreSubscriptions
       @state = ObjectState.new
       @statistic = statistic
       @runner = nil
+      @semaphore = Mutex.new
     end
 
     # Start listening for the events
     # @return [EventStoreSubscriptions::Subscription] returns self
-    def listen
-      self.runner ||=
-        begin
-          state.running!
-          Thread.new do
-            Thread.current.abort_on_exception = false
-            Thread.current.report_on_exception = false
-            client.subscribe_to_stream(
-              *setup.args,
-              **adjusted_kwargs,
-              &setup.blk
-            )
-          rescue StandardError => e
-            statistic.last_error = e
-            statistic.errors_count += 1
-            state.dead!
-            raise
-          end
-        end
-      self
+    make_atomic def listen
+      _listen
     end
 
     # Stops listening for events. This command is async - the result is not immediate. Use the #wait_for_finish 
     # method to wait until the runner has fully stopped.
     # @return [EventStoreSubscriptions::Subscription] returns self
-    def stop_listening
+    make_atomic def stop_listening
       return self unless runner&.alive?
 
       state.halting!
@@ -71,22 +55,38 @@ module EventStoreSubscriptions
       self
     end
 
-    # Removes all properties of object and freezes it. You can't delete currently running
-    #   Subscription though. You must stop it first.
-    # @return [EventStoreSubscriptions::Subscription] frozen object
-    # @raise [EventStoreSubscriptions::ThreadNotDeadError] raises this error in case runner Thread
-    #   is still alive for some reason. Normally this should never happen.
-    def delete
-      if runner&.alive?
-        raise ThreadNotDeadError, "Can not delete alive Subscription #{self.inspect}"
-      end
+    make_atomic def restart
+      return self if runner&.alive?
 
-      instance_variables.each { |var| instance_variable_set(var, nil) }
-      freeze
+      statistic.last_restart_at = Time.now.utc
+      _listen
     end
 
     private
 
+    # @return [EventStoreSubscriptions::Subscription] returns self
+    def _listen
+      self.runner ||=
+        begin
+          state.running!
+          Thread.new do
+            Thread.current.abort_on_exception = false
+            Thread.current.report_on_exception = false
+            client.subscribe_to_stream(
+              *setup.args,
+              **adjusted_kwargs,
+              &setup.blk
+            )
+          rescue StandardError => e
+            statistic.last_error = e
+            statistic.errors_count += 1
+            state.dead!
+            raise
+          end
+        end
+      self
+    end
+
     # Wraps original handler into our own handler to provide extended functionality.
     # @param original_handler [#call]
     # @return [Proc]

data/lib/event_store_subscriptions/subscriptions.rb

@@ -3,6 +3,7 @@
 module EventStoreSubscriptions
   # Implements Subscription-s collection
   class Subscriptions
+    extend MakeAtomic
     ALL_STREAM = '$all'
 
     attr_reader :client
@@ -37,34 +38,34 @@ module EventStoreSubscriptions
     # Adds Subscription to the collection
     # @param subscription [EventStoreSubscriptions::Subscription]
     # @return [Array<EventStoreSubscriptions::Subscription>] current subscription's collection
-    def add(subscription)
-      semaphore.synchronize { @subscriptions << subscription }
+    make_atomic def add(subscription)
+      @subscriptions << subscription
     end
 
     # Removes subscription from the collection
     # @param subscription [EventStoreSubscriptions::Subscription]
     # @return [EventStoreSubscriptions::Subscription, nil] returns deleted subscription or nil if it
     #   wasn't present in the collection
-    def remove(subscription)
-      semaphore.synchronize { @subscriptions.delete(subscription) }
+    make_atomic def remove(subscription)
+      @subscriptions.delete(subscription)
     end
 
     # Starts listening to all subscriptions in the collection
     # @return [Array<EventStoreSubscriptions::Subscription>]
-    def listen_all
-      semaphore.synchronize { @subscriptions.each(&:listen) }
+    make_atomic def listen_all
+      @subscriptions.each(&:listen)
     end
 
     # Stops listening to all subscriptions in the collection
     # @return [Array<EventStoreSubscriptions::Subscription>]
-    def stop_all
-      semaphore.synchronize { @subscriptions.each(&:stop_listening) }
+    make_atomic def stop_all
+      @subscriptions.each(&:stop_listening)
     end
 
     # @return [Array<EventStoreSubscriptions::Subscription>]
-    def subscriptions
+    make_atomic def subscriptions
       # Duping original collection to prevent potential mutable operations over it from user's side
-      semaphore.synchronize { @subscriptions.dup }
+      @subscriptions.dup
     end
 
     private

data/lib/event_store_subscriptions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EventStoreSubscriptions
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/event_store_subscriptions/watch_dog.rb

@@ -92,19 +92,8 @@ module EventStoreSubscriptions
     # @return [EventStoreSubscriptions::Subscription] newly created Subscription
     def restart_subscription(failed_sub)
       return if restart_terminator&.call(failed_sub)
-      # Check if no one else did this job
-      return unless collection.remove(failed_sub)
 
-      new_sub = Subscription.new(
-        position: failed_sub.position,
-        client: failed_sub.client,
-        setup: failed_sub.setup,
-        statistic: failed_sub.statistic
-      )
-      new_sub.statistic.last_restart_at = Time.now.utc
-      collection.add(new_sub)
-      failed_sub.delete
-      new_sub.listen
+      failed_sub.restart
     end
   end
 end

data/lib/event_store_subscriptions.rb

@@ -4,6 +4,7 @@ require 'event_store_client'
 require_relative 'event_store_subscriptions/version'
 require_relative 'event_store_subscriptions/error'
 require_relative 'event_store_subscriptions/wait_for_finish'
+require_relative 'event_store_subscriptions/make_atomic'
 require_relative 'event_store_subscriptions/object_state'
 require_relative 'event_store_subscriptions/subscription_statistic'
 require_relative 'event_store_subscriptions/subscription'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_store_subscriptions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ivan Dzyzenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_store_client
@@ -77,6 +77,7 @@ files:
 - README.md
 - lib/event_store_subscriptions.rb
 - lib/event_store_subscriptions/error.rb
+- lib/event_store_subscriptions/make_atomic.rb
 - lib/event_store_subscriptions/object_state.rb
 - lib/event_store_subscriptions/subscription.rb
 - lib/event_store_subscriptions/subscription_position.rb