ruby_event_store-outbox 0.0.22 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf41fff7a72941537c0247985765f8ca110bc17f14f1e886fca032f172ec918b
-  data.tar.gz: cef6f36936589755f6f636f07ef4edbc823b47ddb2a616700ec63558c75361b8
+  metadata.gz: d9f4e4b0d475d2ad92997aee74165ffacbabbe19282b5d1b266b5ec7b7d3b59b
+  data.tar.gz: adccd92a63810fb4f285c5ea5e4ad37cc22ad671d4550b1d73b289f179d5831b
 SHA512:
-  metadata.gz: 30f86dcda05b796a4adce6cfa7643a2c2aa7b492ce6efe72bed540aa14d5477cc8f81dbd6bbf918500c007490f3857bad8cd268351b05b39d16dfa46ba6213e9
-  data.tar.gz: 25ecce3dc414e61b775cc618ada4c2449f7be1217ed90637a485b5e372f1a1fd9fab3a8dd681ded98409ddb3537c3d2c156e65dae9527940d847fc52b893a998
+  metadata.gz: 4a858aff2550a901615bad83ffa58dc6e30f669a8aa8a422d047343b74a32317d7476e27e95127f9750640eab2e538385b3284840f4c0a6532eff6ee8a20e96e
+  data.tar.gz: b81515fba19988345a3f45397de2d674f94e331475140246ccb5a7266cb19f49f6f2d59445b99fe139b6770e59310a53090f7e9eec2e6503767cf57e5801abb8

data/README.md

@@ -34,11 +34,12 @@ Additionally, your handler's `through_outbox?` method should return `true`, for
 
 ```ruby
 class SomeHandler
-  def self.through_outbox?; true; end
+  def self.through_outbox?
+    true
+  end
 end
 ```
 
-
 ## Installation (outbox process)
 
 Run following process in any way you prefer:
@@ -65,7 +66,6 @@ res_outbox --database-url="mysql2://root@0.0.0.0:3306/my_database" \
   --metrics-url=http://user:password@localhost:8086/dbname"
 ```
 
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/RailsEventStore/rails_event_store.

data/lib/generators/ruby_event_store/outbox/migration_generator.rb

@@ -1,28 +1,30 @@
 # frozen_string_literal: true
 
 begin
-  require 'rails/generators'
+  require "rails/generators"
 rescue LoadError
 end
 
-module RubyEventStore
-  module Outbox
-    class MigrationGenerator < Rails::Generators::Base
-      source_root File.expand_path(File.join(File.dirname(__FILE__), './templates'))
+if defined?(Rails::Generators::Base)
+  module RubyEventStore
+    module Outbox
+      class MigrationGenerator < Rails::Generators::Base
+        source_root File.expand_path(File.join(File.dirname(__FILE__), "./templates"))
 
-      def create_migration
-        template "create_event_store_outbox_template.rb", "db/migrate/#{timestamp}_create_event_store_outbox.rb"
-      end
+        def create_migration
+          template "create_event_store_outbox_template.rb", "db/migrate/#{timestamp}_create_event_store_outbox.rb"
+        end
 
-      private
+        private
 
-      def migration_version
-        "[4.2]"
-      end
+        def migration_version
+          "[4.2]"
+        end
 
-      def timestamp
-        Time.now.strftime("%Y%m%d%H%M%S")
+        def timestamp
+          Time.now.strftime("%Y%m%d%H%M%S")
+        end
       end
     end
   end
-end if defined?(Rails::Generators::Base)
+end

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

@@ -2,17 +2,19 @@ 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/cleanup_strategies/none.rb

@@ -2,8 +2,7 @@ module RubyEventStore
   module Outbox
     module CleanupStrategies
       class None
-        def initialize
-        end
+        def initialize; end
 
         def call(_fetch_specification)
           :ok

data/lib/ruby_event_store/outbox/cli.rb

@@ -11,10 +11,11 @@ module RubyEventStore
         redis_url: nil,
         log_level: :warn,
         split_keys: nil,
-        message_format: 'sidekiq5',
+        message_format: "sidekiq5",
         batch_size: 100,
         metrics_url: nil,
         cleanup_strategy: :none,
+        cleanup_limit: :all,
         sleep_on_empty: 0.5
       }
       Options = Struct.new(*DEFAULTS.keys)
@@ -22,50 +23,69 @@ module RubyEventStore
       class Parser
         def self.parse(argv)
           options = Options.new(*DEFAULTS.values)
-          OptionParser.new do |option_parser|
-            option_parser.banner = "Usage: res_outbox [options]"
+          OptionParser
+            .new do |option_parser|
+              option_parser.banner = "Usage: res_outbox [options]"
 
-            option_parser.on("--database-url=DATABASE_URL", "Database where outbox table is stored") do |database_url|
-              options.database_url = database_url
-            end
+              option_parser.on(
+                "--database-url=DATABASE_URL",
+                "Database where outbox table is stored"
+              ) { |database_url| options.database_url = database_url }
 
-            option_parser.on("--redis-url=REDIS_URL", "URL to redis database") do |redis_url|
-              options.redis_url = redis_url
-            end
+              option_parser.on("--redis-url=REDIS_URL", "URL to redis database") do |redis_url|
+                options.redis_url = redis_url
+              end
 
-            option_parser.on("--log-level=LOG_LEVEL", [:fatal, :error, :warn, :info, :debug], "Logging level, one of: fatal, error, warn, info, debug. Default: warn") do |log_level|
-              options.log_level = log_level.to_sym
-            end
+              option_parser.on(
+                "--log-level=LOG_LEVEL",
+                %i[fatal error warn info debug],
+                "Logging level, one of: fatal, error, warn, info, debug. Default: warn"
+              ) { |log_level| options.log_level = log_level.to_sym }
 
-            option_parser.on("--message-format=FORMAT", ["sidekiq5"], "Message format, supported: sidekiq5. Default: sidekiq5") do |message_format|
-              options.message_format = message_format
-            end
+              option_parser.on(
+                "--message-format=FORMAT",
+                ["sidekiq5"],
+                "Message format, supported: sidekiq5. Default: sidekiq5"
+              ) { |message_format| options.message_format = message_format }
 
-            option_parser.on("--split-keys=SPLIT_KEYS", Array, "Split keys which should be handled, all if not specified") do |split_keys|
-              options.split_keys = split_keys if !split_keys.empty?
-            end
+              option_parser.on(
+                "--split-keys=SPLIT_KEYS",
+                Array,
+                "Split keys which should be handled, all if not specified"
+              ) { |split_keys| options.split_keys = split_keys if !split_keys.empty? }
 
-            option_parser.on("--batch-size=BATCH_SIZE", Integer, "Amount of records fetched in one fetch. Bigger value means more duplicated messages when network problems occur. Default: 100") do |batch_size|
-              options.batch_size = batch_size
-            end
+              option_parser.on(
+                "--batch-size=BATCH_SIZE",
+                Integer,
+                "Amount of records fetched in one fetch. Bigger value means more duplicated messages when network problems occur. Default: 100"
+              ) { |batch_size| options.batch_size = batch_size }
 
-            option_parser.on("--metrics-url=METRICS_URL", "URI to metrics collector, optional") do |metrics_url|
-              options.metrics_url = metrics_url
-            end
+              option_parser.on("--metrics-url=METRICS_URL", "URI to metrics collector, optional") do |metrics_url|
+                options.metrics_url = metrics_url
+              end
 
-            option_parser.on("--cleanup=STRATEGY", "A strategy for cleaning old records. One of: none or iso8601 duration format how old enqueued records should be removed. Default: none") do |cleanup_strategy|
-              options.cleanup_strategy = cleanup_strategy
-            end
+              option_parser.on(
+                "--cleanup=STRATEGY",
+                "A strategy for cleaning old records. One of: none or iso8601 duration format how old enqueued records should be removed. Default: none"
+              ) { |cleanup_strategy| options.cleanup_strategy = cleanup_strategy }
 
-            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
+              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"
+              ) { |cleanup_limit| options.cleanup_limit = cleanup_limit }
 
-            option_parser.on_tail("--version", "Show version") do
-              puts VERSION
-              exit
+              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"
+              ) { |sleep_on_empty| options.sleep_on_empty = sleep_on_empty }
+
+              option_parser.on_tail("--version", "Show version") do
+                puts VERSION
+                exit
+              end
             end
-          end.parse(argv)
+            .parse(argv)
           return options
         end
       end
@@ -87,15 +107,12 @@ 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)
-        outbox_consumer = RubyEventStore::Outbox::Consumer.new(
-          consumer_uuid,
-          consumer_configuration,
-          logger: logger,
-          metrics: metrics,
-        )
+        outbox_consumer =
+          RubyEventStore::Outbox::Consumer.new(consumer_uuid, consumer_configuration, logger: logger, metrics: metrics)
       end
     end
   end

data/lib/ruby_event_store/outbox/cli.rb.orig

@@ -0,0 +1,132 @@
+require "optparse"
+require_relative "version"
+require_relative "consumer"
+require_relative "metrics"
+
+module RubyEventStore
+  module Outbox
+    class CLI
+      DEFAULTS = {
+        database_url: nil,
+        redis_url: nil,
+        log_level: :warn,
+        split_keys: nil,
+        message_format: "sidekiq5",
+        batch_size: 100,
+        metrics_url: nil,
+        cleanup_strategy: :none,
+        cleanup_limit: :all,
+        sleep_on_empty: 0.5
+      }
+      Options = Struct.new(*DEFAULTS.keys)
+
+      class Parser
+        def self.parse(argv)
+          options = Options.new(*DEFAULTS.values)
+          OptionParser
+            .new do |option_parser|
+              option_parser.banner = "Usage: res_outbox [options]"
+
+              option_parser.on(
+                "--database-url=DATABASE_URL",
+                "Database where outbox table is stored"
+              ) { |database_url| options.database_url = database_url }
+
+              option_parser.on("--redis-url=REDIS_URL", "URL to redis database") do |redis_url|
+                options.redis_url = redis_url
+              end
+
+              option_parser.on(
+                "--log-level=LOG_LEVEL",
+                %i[fatal error warn info debug],
+                "Logging level, one of: fatal, error, warn, info, debug. Default: warn"
+              ) { |log_level| options.log_level = log_level.to_sym }
+
+              option_parser.on(
+                "--message-format=FORMAT",
+                ["sidekiq5"],
+                "Message format, supported: sidekiq5. Default: sidekiq5"
+              ) { |message_format| options.message_format = message_format }
+
+              option_parser.on(
+                "--split-keys=SPLIT_KEYS",
+                Array,
+                "Split keys which should be handled, all if not specified"
+              ) { |split_keys| options.split_keys = split_keys if !split_keys.empty? }
+
+              option_parser.on(
+                "--batch-size=BATCH_SIZE",
+                Integer,
+                "Amount of records fetched in one fetch. Bigger value means more duplicated messages when network problems occur. Default: 100"
+              ) { |batch_size| options.batch_size = batch_size }
+
+              option_parser.on("--metrics-url=METRICS_URL", "URI to metrics collector, optional") do |metrics_url|
+                options.metrics_url = metrics_url
+              end
+
+              option_parser.on(
+                "--cleanup=STRATEGY",
+                "A strategy for cleaning old records. One of: none or iso8601 duration format how old enqueued records should be removed. Default: none"
+              ) { |cleanup_strategy| options.cleanup_strategy = cleanup_strategy }
+
+              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"
+              ) { |cleanup_limit| options.cleanup_limit = cleanup_limit }
+
+              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"
+              ) { |sleep_on_empty| options.sleep_on_empty = sleep_on_empty }
+
+              option_parser.on_tail("--version", "Show version") do
+                puts VERSION
+                exit
+              end
+            end
+            .parse(argv)
+          return options
+        end
+      end
+
+      def run(argv)
+        options = Parser.parse(argv)
+        outbox_consumer = build_consumer(options)
+        outbox_consumer.init
+        outbox_consumer.run
+      end
+
+      def build_consumer(options)
+        consumer_uuid = SecureRandom.uuid
+        logger = Logger.new(STDOUT, level: options.log_level, progname: "RES-Outbox #{consumer_uuid}")
+<<<<<<< HEAD
+        consumer_configuration =
+          Consumer::Configuration.new(
+            split_keys: options.split_keys,
+            message_format: options.message_format,
+            batch_size: options.batch_size,
+            database_url: options.database_url,
+            redis_url: options.redis_url,
+            cleanup: options.cleanup_strategy,
+            sleep_on_empty: options.sleep_on_empty
+          )
+=======
+        consumer_configuration = Consumer::Configuration.new(
+          split_keys: options.split_keys,
+          message_format: options.message_format,
+          batch_size: options.batch_size,
+          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,
+        )
+>>>>>>> 7f077fa2... fix error with passing `--cleanup-limit` from CLI to consumer
+        metrics = Metrics.from_url(options.metrics_url)
+        outbox_consumer =
+          RubyEventStore::Outbox::Consumer.new(consumer_uuid, consumer_configuration, logger: logger, metrics: metrics)
+      end
+    end
+  end
+end

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,19 @@ 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:)
@@ -64,12 +74,17 @@ module RubyEventStore
         prepare_traps
 
         @repository = Repository.new(configuration.database_url)
-        @cleanup_strategy = case configuration.cleanup
-        when :none
-          CleanupStrategies::None.new
-        else
-          CleanupStrategies::CleanOldEnqueued.new(repository, ActiveSupport::Duration.parse(configuration.cleanup))
-        end
+        @cleanup_strategy =
+          case configuration.cleanup
+          when :none
+            CleanupStrategies::None.new
+          else
+            CleanupStrategies::CleanOldEnqueued.new(
+              repository,
+              ActiveSupport::Duration.parse(configuration.cleanup),
+              configuration.cleanup_limit
+            )
+          end
       end
 
       def init
@@ -78,7 +93,7 @@ module RubyEventStore
       end
 
       def run
-        while !@gracefully_shutting_down do
+        while !@gracefully_shutting_down
           was_something_changed = one_loop
           if !was_something_changed
             STDOUT.flush
@@ -106,9 +121,7 @@ module RubyEventStore
 
         MAXIMUM_BATCH_FETCHES_IN_ONE_LOCK.times do
           batch = retrieve_batch(fetch_specification)
-          if batch.empty?
-            break
-          end
+          break if batch.empty?
 
           failed_record_ids = []
           updated_record_ids = []
@@ -122,7 +135,7 @@ module RubyEventStore
               updated_record_ids << record.id
             rescue => e
               failed_record_ids << record.id
-              e.full_message.split($/).each {|line| logger.error(line) }
+              e.full_message.split($/).each { |line| logger.error(line) }
             end
           end
 
@@ -140,11 +153,13 @@ module RubyEventStore
           break unless refresh_successful
         end
 
-        metrics.write_point_queue(
-          format: fetch_specification.message_format,
-          split_key: fetch_specification.split_key,
-          remaining: get_remaining_count(fetch_specification)
-        ) unless something_processed
+        unless something_processed
+          metrics.write_point_queue(
+            format: fetch_specification.message_format,
+            split_key: fetch_specification.split_key,
+            remaining: get_remaining_count(fetch_specification)
+          )
+        end
 
         release_lock_for_process(fetch_specification)
 
@@ -156,7 +171,16 @@ module RubyEventStore
       end
 
       private
-      attr_reader :split_keys, :logger, :batch_size, :metrics, :processor, :consumer_uuid, :repository, :cleanup_strategy, :sleep_on_empty
+
+      attr_reader :split_keys,
+                  :logger,
+                  :batch_size,
+                  :metrics,
+                  :processor,
+                  :consumer_uuid,
+                  :repository,
+                  :cleanup_strategy,
+                  :sleep_on_empty
 
       def obtain_lock_for_process(fetch_specification)
         result = repository.obtain_lock_for_process(fetch_specification, consumer_uuid, clock: @clock)
@@ -228,12 +252,8 @@ module RubyEventStore
       end
 
       def prepare_traps
-        Signal.trap("INT") do
-          initiate_graceful_shutdown
-        end
-        Signal.trap("TERM") do
-          initiate_graceful_shutdown
-        end
+        Signal.trap("INT") { initiate_graceful_shutdown }
+        Signal.trap("TERM") { initiate_graceful_shutdown }
       end
 
       def initiate_graceful_shutdown

data/lib/ruby_event_store/outbox/fetch_specification.rb

@@ -10,19 +10,13 @@ module RubyEventStore
       attr_reader :message_format, :split_key
 
       def ==(other)
-        other.instance_of?(self.class) &&
-          other.message_format.eql?(message_format) &&
-          other.split_key.eql?(split_key)
+        other.instance_of?(self.class) && other.message_format.eql?(message_format) && other.split_key.eql?(split_key)
       end
 
       BIG_VALUE = 0b111111100100010000010010110010101011011101110101001100100110000
 
       def hash
-        [
-          self.class,
-          message_format,
-          split_key,
-        ].hash ^ BIG_VALUE
+        [self.class, message_format, split_key].hash ^ BIG_VALUE
       end
 
       alias_method :eql?, :==

data/lib/ruby_event_store/outbox/legacy_sidekiq_scheduler.rb

@@ -18,6 +18,7 @@ module RubyEventStore
       end
 
       private
+
       attr_reader :sidekiq_producer
     end
   end

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

@@ -1,4 +1,4 @@
-require 'influxdb'
+require "influxdb"
 
 module RubyEventStore
   module Outbox
@@ -6,38 +6,32 @@ module RubyEventStore
       class Influx
         def initialize(url)
           uri = URI.parse(url)
-          options = {
-            url: url,
-            async: true,
-            time_precision: 'ns',
-          }
+          options = { url: url, async: true, time_precision: "ns" }
           @influxdb_client = InfluxDB::Client.new(**options)
         end
 
         def write_operation_result(operation, result)
-          write_point("ruby_event_store.outbox.lock", {
-            values: {
-              value: 1,
-            },
-            tags: {
-              operation: operation,
-              result: result,
-            }
-          })
+          write_point(
+            "ruby_event_store.outbox.lock",
+            { values: { value: 1 }, tags: { operation: operation, result: result } }
+          )
         end
 
         def write_point_queue(enqueued: 0, failed: 0, remaining: 0, format: nil, split_key: nil)
-          write_point("ruby_event_store.outbox.queue", {
-            values: {
-              enqueued: enqueued,
-              failed: failed,
-              remaining: remaining,
-            },
-            tags: {
-              format: format,
-              split_key: split_key,
+          write_point(
+            "ruby_event_store.outbox.queue",
+            {
+              values: {
+                enqueued: enqueued,
+                failed: failed,
+                remaining: remaining
+              },
+              tags: {
+                format: format,
+                split_key: split_key
+              }
             }
-          })
+          )
         end
 
         def write_point(series, data)

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

@@ -2,11 +2,9 @@ module RubyEventStore
   module Outbox
     module Metrics
       class Null
-        def write_operation_result(operation, result)
-        end
+        def write_operation_result(operation, result); end
 
-        def write_point_queue(**kwargs)
-        end
+        def write_point_queue(**kwargs); end
       end
     end
   end

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

@@ -1,4 +1,4 @@
-require 'influxdb'
+require "influxdb"
 
 module RubyEventStore
   module Outbox
@@ -14,7 +14,13 @@ module RubyEventStore
         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}
+          @queue_stats << {
+            enqueued: enqueued,
+            failed: failed,
+            remaining: remaining,
+            format: format,
+            split_key: split_key
+          }
         end
 
         attr_reader :operation_results, :queue_stats

data/lib/ruby_event_store/outbox/repository.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'active_record'
-require 'active_support/core_ext/numeric/time.rb'
+require "active_record"
+require "active_support/core_ext/numeric/time.rb"
 
 module RubyEventStore
   module Outbox
@@ -10,7 +10,7 @@ module RubyEventStore
 
       class Record < ::ActiveRecord::Base
         self.primary_key = :id
-        self.table_name = 'event_store_outbox'
+        self.table_name = "event_store_outbox"
 
         def self.remaining_for(fetch_specification)
           where(format: fetch_specification.message_format, split_key: fetch_specification.split_key, enqueued_at: nil)
@@ -30,7 +30,7 @@ module RubyEventStore
       end
 
       class Lock < ::ActiveRecord::Base
-        self.table_name = 'event_store_outbox_locks'
+        self.table_name = "event_store_outbox_locks"
 
         def self.obtain(fetch_specification, process_uuid, clock:)
           transaction do
@@ -39,10 +39,7 @@ module RubyEventStore
             if l.recently_locked?(clock: clock)
               :taken
             else
-              l.update!(
-                locked_by: process_uuid,
-                locked_at: clock.now,
-              )
+              l.update!(locked_by: process_uuid, locked_at: clock.now)
               l
             end
           end
@@ -98,6 +95,7 @@ module RubyEventStore
         end
 
         private
+
         def self.lock_for_split_key(fetch_specification)
           lock.find_by(format: fetch_specification.message_format, split_key: fetch_specification.split_key)
         end
@@ -142,11 +140,10 @@ module RubyEventStore
         record.update_column(:enqueued_at, now)
       end
 
-      def delete_enqueued_older_than(fetch_specification, duration)
-        Record
-          .for_fetch_specification(fetch_specification)
-          .where("enqueued_at < ?", duration.ago)
-          .delete_all
+      def delete_enqueued_older_than(fetch_specification, duration, limit)
+        scope = Record.for_fetch_specification(fetch_specification).where("enqueued_at < ?", duration.ago)
+        scope = scope.limit(limit).order(:id) unless limit == :all
+        scope.delete_all
         :ok
       rescue ActiveRecord::Deadlocked
         :deadlocked

data/lib/ruby_event_store/outbox/sidekiq_processor.rb

@@ -17,9 +17,7 @@ module RubyEventStore
 
         queue = parsed_record["queue"]
         raise InvalidPayload.new("Missing queue") if queue.nil? || queue.empty?
-        payload = JSON.generate(parsed_record.merge({
-          "enqueued_at" => now.to_f,
-        }))
+        payload = JSON.generate(parsed_record.merge({ "enqueued_at" => now.to_f }))
 
         redis.lpush("queue:#{queue}", payload)
 
@@ -38,6 +36,7 @@ module RubyEventStore
       end
 
       private
+
       attr_reader :redis
     end
   end

data/lib/ruby_event_store/outbox/sidekiq_producer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'sidekiq'
-require_relative 'sidekiq5_format'
+require "sidekiq"
+require_relative "sidekiq5_format"
 require_relative "repository"
 
 module RubyEventStore
@@ -9,22 +9,25 @@ module RubyEventStore
     class SidekiqProducer
       def call(klass, args)
         sidekiq_client = Sidekiq::Client.new(Sidekiq.redis_pool)
-        item = {
-          'args' => args.map(&:to_h).map {|h| h.transform_keys(&:to_s)},
-          'class' => klass,
-        }
+        item = { "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.middleware.invoke(normalized_item['class'], normalized_item, normalized_item['queue'], Sidekiq.redis_pool) { normalized_item }
+        payload =
+          sidekiq_client
+            .middleware
+            .invoke(normalized_item["class"], normalized_item, normalized_item["queue"], Sidekiq.redis_pool) do
+              normalized_item
+            end
         if payload
           Repository::Record.create!(
             format: SIDEKIQ5_FORMAT,
-            split_key: payload.fetch('queue'),
+            split_key: payload.fetch("queue"),
             payload: payload.to_json
           )
         end
       end
 
       private
+
       attr_reader :repository
     end
   end

data/lib/ruby_event_store/outbox/sidekiq_scheduler.rb

@@ -19,6 +19,7 @@ module RubyEventStore
       end
 
       private
+
       attr_reader :serializer, :sidekiq_producer
     end
   end

data/lib/ruby_event_store/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module Outbox
-    VERSION = "0.0.22"
+    VERSION = "0.0.25"
   end
 end

data/lib/ruby_event_store/outbox.rb

@@ -5,8 +5,8 @@ module RubyEventStore
   end
 end
 
-require_relative 'outbox/fetch_specification'
-require_relative 'outbox/repository'
-require_relative 'outbox/sidekiq_scheduler'
-require_relative 'outbox/legacy_sidekiq_scheduler'
-require_relative 'outbox/version'
+require_relative "outbox/fetch_specification"
+require_relative "outbox/repository"
+require_relative "outbox/sidekiq_scheduler"
+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.22
+  version: 0.0.25
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-20 00:00:00.000000000 Z
+date: 2022-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 description: 
 email: dev@arkency.com
 executables:
@@ -54,6 +54,7 @@ files:
 - lib/ruby_event_store/outbox/cleanup_strategies/clean_old_enqueued.rb
 - lib/ruby_event_store/outbox/cleanup_strategies/none.rb
 - lib/ruby_event_store/outbox/cli.rb
+- lib/ruby_event_store/outbox/cli.rb.orig
 - lib/ruby_event_store/outbox/consumer.rb
 - lib/ruby_event_store/outbox/fetch_specification.rb
 - lib/ruby_event_store/outbox/legacy_sidekiq_scheduler.rb