ruby_event_store-outbox 0.0.18 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14cc2d7efea5445a91aad847cf380e9a5b743c2aa649ee8ca1d07b0093b13c36
-  data.tar.gz: 3a42ce8411f6c7fe36acb2007b13b392570859c52f0111bad22db9be09216720
+  metadata.gz: 5db68b30315551cd7f8e2800c825b12710fd836e20a273b9a8be269955628fa3
+  data.tar.gz: f48d917e788f17731a1338129e399e6fa9919c38683ffed9202ca59b99816540
 SHA512:
-  metadata.gz: 8919dc60db4ba6f37822a6fd1eff751b06b8c748f310c521157e2e41630bbe8b20705e93edeb66d1891f93c2cd9717cc407513bc2194e4c7f979102c540c3618
-  data.tar.gz: a78188907f82607f3f3cf164b554748af7603589c8a60ab25face59d5d5efd73c3ea14cfaf6b599bd1abe2b6162efa978565ebdcc24ec68102f5a03f172b8737
+  metadata.gz: b0df42b4e20532df318b443950b6741df4130424b988602d6f2a141ff485f101ce845c97471faeb0d9403dc48d0411637f8d41a56a7cfa01ba87c9b2f4a05f9d
+  data.tar.gz: c8acb6b872bc7362d5362ab8299ccb1a4d099b92bf7f2c5685494fb0c7e5c1783d7925eb2c1e9df2f26e30c2e24010a1d59737a3a06d82175775f5278d69ac49

data/lib/ruby_event_store/outbox/consumer.rb

@@ -164,24 +164,23 @@ module RubyEventStore
         when :deadlocked
           logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
           metrics.write_operation_result("obtain", "deadlocked")
-          return false
+          false
         when :lock_timeout
           logger.warn "Obtaining lock for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
           metrics.write_operation_result("obtain", "lock_timeout")
-          return false
+          false
         when :taken
           logger.debug "Obtaining lock for split_key '#{fetch_specification.split_key}' unsuccessful (taken)"
           metrics.write_operation_result("obtain", "taken")
-          return false
+          false
         else
-          return result
+          result
         end
       end
 
       def release_lock_for_process(fetch_specification)
         result = repository.release_lock_for_process(fetch_specification, consumer_uuid)
         case result
-        when :ok
         when :deadlocked
           logger.warn "Releasing lock for split_key '#{fetch_specification.split_key}' failed (deadlock)"
           metrics.write_operation_result("release", "deadlocked")
@@ -191,8 +190,6 @@ module RubyEventStore
         when :not_taken_by_this_process
           logger.debug "Releasing lock for split_key '#{fetch_specification.split_key}' failed (not taken by this process)"
           metrics.write_operation_result("release", "not_taken_by_this_process")
-        else
-          raise "Unexpected result #{result}"
         end
       end
 
@@ -221,15 +218,12 @@ module RubyEventStore
       def cleanup(fetch_specification)
         result = cleanup_strategy.call(fetch_specification)
         case result
-        when :ok
         when :deadlocked
           logger.warn "Cleanup for split_key '#{fetch_specification.split_key}' failed (deadlock)"
           metrics.write_operation_result("cleanup", "deadlocked")
         when :lock_timeout
           logger.warn "Cleanup for split_key '#{fetch_specification.split_key}' failed (lock timeout)"
           metrics.write_operation_result("cleanup", "lock_timeout")
-        else
-          raise "Unexpected result #{result}"
         end
       end
 

data/lib/ruby_event_store/outbox/legacy_sidekiq_scheduler.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative "sidekiq_producer"
+
+module RubyEventStore
+  module Outbox
+    class LegacySidekiqScheduler
+      def initialize
+        @sidekiq_producer = SidekiqProducer.new
+      end
+
+      def call(klass, serialized_record)
+        sidekiq_producer.call(klass, [serialized_record])
+      end
+
+      def verify(subscriber)
+        Class === subscriber && subscriber.respond_to?(:through_outbox?) && subscriber.through_outbox?
+      end
+
+      private
+      attr_reader :sidekiq_producer
+    end
+  end
+end

data/lib/ruby_event_store/outbox/metrics/test.rb

@@ -0,0 +1,24 @@
+require 'influxdb'
+
+module RubyEventStore
+  module Outbox
+    module Metrics
+      class Test
+        def initialize
+          @operation_results = []
+          @queue_stats = []
+        end
+
+        def write_operation_result(operation, result)
+          @operation_results << { operation: operation, result: result }
+        end
+
+        def write_point_queue(enqueued: 0, failed: 0, remaining: 0, format: nil, split_key: nil)
+          @queue_stats << { enqueued: enqueued, failed: failed, remaining: remaining, format: format, split_key: split_key}
+        end
+
+        attr_reader :operation_results, :queue_stats
+      end
+    end
+  end
+end

data/lib/ruby_event_store/outbox/repository.rb

@@ -36,7 +36,7 @@ module RubyEventStore
           transaction do
             l = get_lock_record(fetch_specification)
 
-            if l.recently_locked?
+            if l.recently_locked?(clock: clock)
               :taken
             else
               l.update!(
@@ -89,8 +89,8 @@ module RubyEventStore
           locked_by.eql?(process_uuid)
         end
 
-        def recently_locked?
-          locked_by && locked_at > RECENTLY_LOCKED_DURATION.ago
+        def recently_locked?(clock:)
+          locked_by && locked_at > RECENTLY_LOCKED_DURATION.ago(clock.now)
         end
 
         def fetch_specification

data/lib/ruby_event_store/outbox/sidekiq_producer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'sidekiq'
+require_relative 'sidekiq5_format'
 require_relative "repository"
 
 module RubyEventStore
@@ -10,7 +11,7 @@ module RubyEventStore
         sidekiq_client = Sidekiq::Client.new(Sidekiq.redis_pool)
         item = {
           'class' => klass,
-          'args' => args,
+          'args' => args.map(&:to_h).map {|h| h.transform_keys(&:to_s)},
         }
         normalized_item = sidekiq_client.__send__(:normalize_item, item)
         payload = sidekiq_client.__send__(:process_single, normalized_item.fetch('class'), normalized_item)

data/lib/ruby_event_store/outbox/sidekiq_scheduler.rb

@@ -5,12 +5,13 @@ require_relative "sidekiq_producer"
 module RubyEventStore
   module Outbox
     class SidekiqScheduler
-      def initialize
+      def initialize(serializer: YAML)
+        @serializer = serializer
         @sidekiq_producer = SidekiqProducer.new
       end
 
-      def call(klass, serialized_record)
-        sidekiq_producer.call(klass, [serialized_record.to_h])
+      def call(klass, record)
+        sidekiq_producer.call(klass, [record.serialize(serializer)])
       end
 
       def verify(subscriber)
@@ -18,7 +19,7 @@ module RubyEventStore
       end
 
       private
-      attr_reader :sidekiq_producer
+      attr_reader :serializer, :sidekiq_producer
     end
   end
 end

data/lib/ruby_event_store/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module Outbox
-    VERSION = "0.0.18"
+    VERSION = "0.0.21"
   end
 end

data/lib/ruby_event_store/outbox.rb

@@ -8,5 +8,5 @@ end
 require_relative 'outbox/fetch_specification'
 require_relative 'outbox/repository'
 require_relative 'outbox/sidekiq_scheduler'
-require_relative 'outbox/consumer'
+require_relative 'outbox/legacy_sidekiq_scheduler'
 require_relative 'outbox/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.21
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -55,14 +55,14 @@ files:
 - lib/ruby_event_store/outbox/cleanup_strategies/none.rb
 - lib/ruby_event_store/outbox/cli.rb
 - lib/ruby_event_store/outbox/consumer.rb
-- lib/ruby_event_store/outbox/consumer_process.rb
 - lib/ruby_event_store/outbox/fetch_specification.rb
+- lib/ruby_event_store/outbox/legacy_sidekiq_scheduler.rb
 - lib/ruby_event_store/outbox/metrics.rb
 - lib/ruby_event_store/outbox/metrics/influx.rb
 - lib/ruby_event_store/outbox/metrics/null.rb
+- lib/ruby_event_store/outbox/metrics/test.rb
 - lib/ruby_event_store/outbox/repository.rb
 - lib/ruby_event_store/outbox/sidekiq5_format.rb
-- lib/ruby_event_store/outbox/sidekiq_message_handler.rb
 - lib/ruby_event_store/outbox/sidekiq_processor.rb
 - lib/ruby_event_store/outbox/sidekiq_producer.rb
 - lib/ruby_event_store/outbox/sidekiq_scheduler.rb
@@ -74,6 +74,7 @@ metadata:
   homepage_uri: https://railseventstore.org
   source_code_uri: https://github.com/RailsEventStore/rails_event_store
   bug_tracker_uri: https://github.com/RailsEventStore/rails_event_store/issues
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Active Record based outbox for Ruby Event Store

data/lib/ruby_event_store/outbox/consumer_process.rb

@@ -1,6 +0,0 @@
-module RubyEventStore
-  module Outbox
-    class ConsumerProcess
-    end
-  end
-end

data/lib/ruby_event_store/outbox/sidekiq_message_handler.rb

@@ -1,19 +0,0 @@
-require "sidekiq"
-
-module RubyEventStore
-  module Outbox
-    class SidekiqMessageHandler
-      def initialize
-        @sidekiq = Sidekiq::Client.new(Sidekiq.redis_pool)
-      end
-
-      def init
-      end
-
-      def handle_one_record(now, record)
-        hash_payload = JSON.parse(record.payload)
-        @sidekiq.__send__(:raw_push, [hash_payload])
-      end
-    end
-  end
-end