ruby_event_store-outbox 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbabda53c709b7e11850772272b736226ed33e441392e9f7a1b7b5e3ead47b7
-  data.tar.gz: 02eec2972f701e1ecc09bd65c38cecafef53d4dc45f95f69a869457289a1edcc
+  metadata.gz: 14cc2d7efea5445a91aad847cf380e9a5b743c2aa649ee8ca1d07b0093b13c36
+  data.tar.gz: 3a42ce8411f6c7fe36acb2007b13b392570859c52f0111bad22db9be09216720
 SHA512:
-  metadata.gz: aec65f023d21c3a86204b31b22ae1b21157f46c39869a22e522efe7b13e320cd3d4f75ef139c6e421d40b203a3d33bcb368cf16cb98552ff803380a36469290a
-  data.tar.gz: 6fa822fb40b763717f31297944423bcb708400ba3bfad9852cde4edc99f79308ad3bb837ffc593d2cae6942961735a6d5c6c9bf25088bafbaea9b48f2d278842
+  metadata.gz: 8919dc60db4ba6f37822a6fd1eff751b06b8c748f310c521157e2e41630bbe8b20705e93edeb66d1891f93c2cd9717cc407513bc2194e4c7f979102c540c3618
+  data.tar.gz: a78188907f82607f3f3cf164b554748af7603589c8a60ab25face59d5d5efd73c3ea14cfaf6b599bd1abe2b6162efa978565ebdcc24ec68102f5a03f172b8737

data/lib/ruby_event_store/outbox/cleanup_strategies/none.rb

@@ -6,6 +6,7 @@ module RubyEventStore
         end
 
         def call(_fetch_specification)
+          :ok
         end
       end
     end

data/lib/ruby_event_store/outbox/consumer.rb

@@ -148,7 +148,7 @@ module RubyEventStore
 
         release_lock_for_process(fetch_specification)
 
-        cleanup_strategy.call(fetch_specification)
+        cleanup(fetch_specification)
 
         processor.after_batch
 
@@ -218,6 +218,21 @@ module RubyEventStore
         end
       end
 
+      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
+
       def prepare_traps
         Signal.trap("INT") do
           initiate_graceful_shutdown

data/lib/ruby_event_store/outbox/consumer_process.rb

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

data/lib/ruby_event_store/outbox/repository.rb

@@ -147,6 +147,11 @@ module RubyEventStore
           .for_fetch_specification(fetch_specification)
           .where("enqueued_at < ?", duration.ago)
           .delete_all
+        :ok
+      rescue ActiveRecord::Deadlocked
+        :deadlocked
+      rescue ActiveRecord::LockWaitTimeout
+        :lock_timeout
       end
     end
   end

data/lib/ruby_event_store/outbox/sidekiq_message_handler.rb

@@ -0,0 +1,19 @@
+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

data/lib/ruby_event_store/outbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -55,12 +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/metrics.rb
 - lib/ruby_event_store/outbox/metrics/influx.rb
 - lib/ruby_event_store/outbox/metrics/null.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
@@ -87,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Active Record based outbox for Ruby Event Store