ruby_event_store-outbox 0.0.21 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db68b30315551cd7f8e2800c825b12710fd836e20a273b9a8be269955628fa3
-  data.tar.gz: f48d917e788f17731a1338129e399e6fa9919c38683ffed9202ca59b99816540
+  metadata.gz: 7c7c7068c9bd49735031384ece752500cc641f5035bc1f7953104e64a3d22dd8
+  data.tar.gz: 2975fdb8c2dfe6fc9843ce5efd00042a2c16d2d9ec2e6524598507a4fcb36dc3
 SHA512:
-  metadata.gz: b0df42b4e20532df318b443950b6741df4130424b988602d6f2a141ff485f101ce845c97471faeb0d9403dc48d0411637f8d41a56a7cfa01ba87c9b2f4a05f9d
-  data.tar.gz: c8acb6b872bc7362d5362ab8299ccb1a4d099b92bf7f2c5685494fb0c7e5c1783d7925eb2c1e9df2f26e30c2e24010a1d59737a3a06d82175775f5278d69ac49
+  metadata.gz: 3a1118657e1c164df15f9eb7d117adb80a4f7a693eed4a3974dc4a9b0f3bdbd15504f441fe50dbd0fdf5318fae6205dd2c4cadeebd0c4897a61fb4be4ea2e382
+  data.tar.gz: 7a84d03ea98a5d2b0019f2eedf3c76b509f5bb25c44fb2db7dc9a952c1752cf4db17ee284fd9ee8bce4295267743a29222d26bee1709d554375f95c64ebb1203

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

@@ -2,17 +2,18 @@ module RubyEventStore
   module Outbox
     module CleanupStrategies
       class CleanOldEnqueued
-        def initialize(repository, duration)
+        def initialize(repository, duration, limit)
           @repository = repository
           @duration = duration
+          @limit = limit
         end
 
         def call(fetch_specification)
-          repository.delete_enqueued_older_than(fetch_specification, duration)
+          repository.delete_enqueued_older_than(fetch_specification, duration, limit)
         end
 
         private
-        attr_reader :repository, :duration
+        attr_reader :repository, :duration, :limit
       end
     end
   end

data/lib/ruby_event_store/outbox/cli.rb

@@ -15,6 +15,7 @@ module RubyEventStore
         batch_size: 100,
         metrics_url: nil,
         cleanup_strategy: :none,
+        cleanup_limit: :all,
         sleep_on_empty: 0.5
       }
       Options = Struct.new(*DEFAULTS.keys)
@@ -57,6 +58,10 @@ module RubyEventStore
               options.cleanup_strategy = cleanup_strategy
             end
 
+            option_parser.on("--cleanup-limit=LIMIT", "Amount of records removed in single cleanup run. One of: all or number of records that should be removed. Default: all") do |cleanup_limit|
+              options.cleanup_limit = cleanup_limit
+            end
+
             option_parser.on("--sleep-on-empty=SLEEP_TIME", Float, "How long to sleep before next check when there was nothing to do. Default: 0.5") do |sleep_on_empty|
               options.sleep_on_empty = sleep_on_empty
             end
@@ -87,6 +92,7 @@ module RubyEventStore
           database_url: options.database_url,
           redis_url: options.redis_url,
           cleanup: options.cleanup_strategy,
+          cleanup_limit: options.cleanup_limit,
           sleep_on_empty: options.sleep_on_empty,
         )
         metrics = Metrics.from_url(options.metrics_url)

data/lib/ruby_event_store/outbox/consumer.rb

@@ -21,6 +21,7 @@ module RubyEventStore
           database_url:,
           redis_url:,
           cleanup:,
+          cleanup_limit:,
           sleep_on_empty:
         )
           @split_keys = split_keys
@@ -29,6 +30,7 @@ module RubyEventStore
           @database_url = database_url
           @redis_url = redis_url
           @cleanup = cleanup
+          @cleanup_limit = cleanup_limit
           @sleep_on_empty = sleep_on_empty
           freeze
         end
@@ -41,11 +43,12 @@ module RubyEventStore
             database_url: overriden_options.fetch(:database_url, database_url),
             redis_url: overriden_options.fetch(:redis_url, redis_url),
             cleanup: overriden_options.fetch(:cleanup, cleanup),
+            cleanup_limit: overriden_options.fetch(:cleanup_limit, cleanup_limit),
             sleep_on_empty: overriden_options.fetch(:sleep_on_empty, sleep_on_empty)
           )
         end
 
-        attr_reader :split_keys, :message_format, :batch_size, :database_url, :redis_url, :cleanup, :sleep_on_empty
+        attr_reader :split_keys, :message_format, :batch_size, :database_url, :redis_url, :cleanup, :cleanup_limit, :sleep_on_empty
       end
 
       def initialize(consumer_uuid, configuration, clock: Time, logger:, metrics:)
@@ -68,7 +71,7 @@ module RubyEventStore
         when :none
           CleanupStrategies::None.new
         else
-          CleanupStrategies::CleanOldEnqueued.new(repository, ActiveSupport::Duration.parse(configuration.cleanup))
+          CleanupStrategies::CleanOldEnqueued.new(repository, ActiveSupport::Duration.parse(configuration.cleanup), configuration.cleanup_limit)
         end
       end
 

data/lib/ruby_event_store/outbox/repository.rb

@@ -142,11 +142,12 @@ module RubyEventStore
         record.update_column(:enqueued_at, now)
       end
 
-      def delete_enqueued_older_than(fetch_specification, duration)
-        Record
+      def delete_enqueued_older_than(fetch_specification, duration, limit)
+        scope = Record
           .for_fetch_specification(fetch_specification)
           .where("enqueued_at < ?", duration.ago)
-          .delete_all
+        scope = scope.limit(limit) unless limit == :all
+        scope.delete_all
         :ok
       rescue ActiveRecord::Deadlocked
         :deadlocked

data/lib/ruby_event_store/outbox/sidekiq_producer.rb

@@ -10,11 +10,11 @@ module RubyEventStore
       def call(klass, args)
         sidekiq_client = Sidekiq::Client.new(Sidekiq.redis_pool)
         item = {
-          'class' => klass,
           'args' => args.map(&:to_h).map {|h| h.transform_keys(&:to_s)},
+          'class' => klass,
         }
         normalized_item = sidekiq_client.__send__(:normalize_item, item)
-        payload = sidekiq_client.__send__(:process_single, normalized_item.fetch('class'), normalized_item)
+        payload = sidekiq_client.middleware.invoke(normalized_item['class'], normalized_item, normalized_item['queue'], Sidekiq.redis_pool) { normalized_item }
         if payload
           Repository::Record.create!(
             format: SIDEKIQ5_FORMAT,

data/lib/ruby_event_store/outbox/sidekiq_scheduler.rb

@@ -5,7 +5,7 @@ require_relative "sidekiq_producer"
 module RubyEventStore
   module Outbox
     class SidekiqScheduler
-      def initialize(serializer: YAML)
+      def initialize(serializer: RubyEventStore::Serializers::YAML)
         @serializer = serializer
         @sidekiq_producer = SidekiqProducer.new
       end

data/lib/ruby_event_store/outbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.24
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-24 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.9
 signing_key: 
 specification_version: 4
 summary: Active Record based outbox for Ruby Event Store