ruby_event_store-outbox 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a53d0609414ba7c53da1a8602042de223631437392a9a29b0e3dbb3d2015a61
-  data.tar.gz: fa4dde249eecb5701f311d91a772fc12394b5412c6af18649d5ba604b11c9567
+  metadata.gz: d7e02fae40b268652d0187bfff203ea94993204069992b05d71808a3a820b28b
+  data.tar.gz: c78fdc01af8ca386f23babbcc409535e4c983238af4a13e3541d32f8b30b7f96
 SHA512:
-  metadata.gz: f8d236f0e1cb2236f3740e7f92ea19662df5af2350e729266c50635208e3d714ccef6dfdd1f9080ac9237467a88be351e07f656cd5ae2361223f4eb6c96fb3cc
-  data.tar.gz: eb6718caa012a1d6f5ed52374108c0a74f2f7faf73ddb8208d17c2f0bdb636712ee30249865b8eb39d410c1f273721e0495fa53d2b3f32d06a8f2be98eb4459f
+  metadata.gz: cca7886a64c64912770e4415ec65523309c6af0ef5edbc0c3d5a55fd2e7937be36517104d0539a1436e006af5623f82d0f7be09e79f2b78604fd257c85d8c0ed
+  data.tar.gz: d8435157be3745483024b2ddbc867502a0a340a10846485b35ac204eba845b5e05da924f24771b9b8e697b911c9c3eb605c5d7129c4fe8c9e0d66ca04138e6eb

data/lib/ruby_event_store/outbox/consumer.rb

@@ -46,6 +46,10 @@ module RubyEventStore
         @metrics = metrics
         @batch_size = configuration.batch_size
         ActiveRecord::Base.establish_connection(configuration.database_url) unless ActiveRecord::Base.connected?
+        if ActiveRecord::Base.connection.adapter_name == "Mysql2"
+          ActiveRecord::Base.connection.execute("SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;")
+          ActiveRecord::Base.connection.execute("SET SESSION innodb_lock_wait_timeout = 1;")
+        end
 
         raise "Unknown format" if configuration.message_format != SIDEKIQ5_FORMAT
         @message_format = SIDEKIQ5_FORMAT
@@ -83,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
@@ -96,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
@@ -112,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/metrics/influx.rb

@@ -5,7 +5,16 @@ module RubyEventStore
     module Metrics
       class Influx
         def initialize(url)
-          @influxdb_client = InfluxDB::Client.new(url: url, async: true, time_precision: 'ns')
+          uri = URI.parse(url)
+          params = CGI.parse(uri.query || "")
+          options = {
+            url: url,
+            async: true,
+            time_precision: 'ns',
+          }
+          options[:username] = params.fetch("username").first if params.key?("username")
+          options[:password] = params.fetch("password").first if params.key?("password")
+          @influxdb_client = InfluxDB::Client.new(**options)
         end
 
         def write_point_queue(status:, enqueued: 0, failed: 0)
@@ -21,11 +30,10 @@ module RubyEventStore
         end
 
         def write_point(series, data)
-          data[:timestamp] ||= Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond).to_i
-          @influxdb_client.write_point(series, data)
+          data[:timestamp] = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
+          influxdb_client.write_point(series, data)
         end
 
-        private
         attr_reader :influxdb_client
       end
     end

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

@@ -2,7 +2,7 @@ module RubyEventStore
   module Outbox
     module Metrics
       class Null
-        def write_point_queue(status:, enqueued: 0, failed: 0)
+        def write_point_queue(**kwargs)
         end
       end
     end

data/lib/ruby_event_store/outbox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-outbox
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store