ruby_event_store-outbox 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da07b2263a96dbbfaad959ab5dd5636d5bb3398d810894080ab6e3f80750c29f
-  data.tar.gz: 53cd5a2de183f9c821eacf6c05689f42e1fdc39120aac25aa450f90601bbd964
+  metadata.gz: d7e02fae40b268652d0187bfff203ea94993204069992b05d71808a3a820b28b
+  data.tar.gz: c78fdc01af8ca386f23babbcc409535e4c983238af4a13e3541d32f8b30b7f96
 SHA512:
-  metadata.gz: d6e7cb309a64e4743ae5e6d182987c7b1d35378b0a371ce784c2f0695de026903a92d58106e98fdbab73687bf0c35f89912a614982f8347e5b4d0f0ab0daabf4
-  data.tar.gz: 1d7fe76b631564b4205dab9f928da9487e6db08cf93cee9b52a975b7cad65dddd07de97babd586851855c262f1428f902a3612185b9bc0fc7f3a4fa848c0024c
+  metadata.gz: cca7886a64c64912770e4415ec65523309c6af0ef5edbc0c3d5a55fd2e7937be36517104d0539a1436e006af5623f82d0f7be09e79f2b78604fd257c85d8c0ed
+  data.tar.gz: d8435157be3745483024b2ddbc867502a0a340a10846485b35ac204eba845b5e05da924f24771b9b8e697b911c9c3eb605c5d7129c4fe8c9e0d66ca04138e6eb

data/lib/ruby_event_store/outbox/consumer.rb

@@ -87,11 +87,12 @@ module RubyEventStore
 
           now = @clock.now.utc
           failed_record_ids = []
-          records.each do |record|
+          records.group_by(&:split_key).each do |split_key, records2|
             begin
-              handle_one_record(now, record)
+              failed = handle_group_of_records(now, split_key, records2)
+              failed_record_ids.concat(failed.map(&:id))
             rescue => e
-              failed_record_ids << record.id
+              failed_record_ids.concat(records2.map(&:id))
               e.full_message.split($/).each {|line| logger.error(line) }
             end
           end
@@ -100,7 +101,7 @@ module RubyEventStore
           Record.where(id: updated_record_ids).update_all(enqueued_at: now)
           metrics.write_point_queue(status: "ok", enqueued: updated_record_ids.size, failed: failed_record_ids.size)
 
-          logger.info "Sent #{records.size} messages from outbox table"
+          logger.info "Sent #{updated_record_ids.size} messages from outbox table"
           true
         end
       rescue ActiveRecord::Deadlocked
@@ -116,11 +117,21 @@ module RubyEventStore
       private
       attr_reader :split_keys, :logger, :message_format, :batch_size, :metrics
 
-      def handle_one_record(now, record)
-        hash_payload = JSON.parse(record.payload)
-        @redis.lpush("queue:#{hash_payload.fetch("queue")}", JSON.generate(JSON.parse(record.payload).merge({
-          "enqueued_at" => now.to_f,
-        })))
+      def handle_group_of_records(now, split_key, records)
+        failed = []
+        elements = []
+        records.each do |record|
+          begin
+            elements << JSON.generate(JSON.parse(record.payload).merge({
+              "enqueued_at" => now.to_f,
+            }))
+          rescue => e
+            failed << record
+            e.full_message.split($/).each {|line| logger.error(line) }
+          end
+        end
+        @redis.lpush("queue:#{split_key}", elements)
+        failed
       end
 
       def prepare_traps

data/lib/ruby_event_store/outbox/metrics.rb

@@ -1,13 +1,12 @@
-require "ruby_event_store/outbox/metrics/null"
-require "ruby_event_store/outbox/metrics/influx"
-
 module RubyEventStore
   module Outbox
     module Metrics
       def self.from_url(metrics_url)
         if metrics_url.nil?
+          require "ruby_event_store/outbox/metrics/null"
           Null.new
         else
+          require "ruby_event_store/outbox/metrics/influx"
           Influx.new(metrics_url)
         end
       end

data/lib/ruby_event_store/outbox/version.rb

@@ -2,6 +2,6 @@
 
 module RubyEventStore
   module Outbox
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Arkency
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: influxdb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 description: 
 email:
 - dev@arkency.com