railbox 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8288bdb997d56c541329eed5c0dadda7c6c3b7d14a5796cc146c3ff183b56fda
-  data.tar.gz: 8c51b795c45826283891f4f6bedb9944064499fdb90eba4d0cfdb26fb135f239
+  metadata.gz: 9bee1e734460ab0bc5d07c19cf133c1a46bde8e0e943b7a5e50a480d5fdce24f
+  data.tar.gz: 40b7b8f3e1c3ac79447dc56d0eb682ea58a2c82205481f6f13656319a6955803
 SHA512:
-  metadata.gz: 77d9775e1701a7c476868e408918a5cf59ecaf2493e2ccbb5c2af1c14b60752e030abb237a1c21b223bca23e83dcc7b7d69cceb6ee2582355c54ab6d1d5301c8
-  data.tar.gz: dcdc42f6ab3c70380b4835de2218c03b38798ed97ff53eb01d9310468043eb8089024493e3bbfafac84befe06357b1a2ba8101a2ecdac872e5b0207e0c861b12
+  metadata.gz: 2c2b6dbde97ef2814a83b5b75149c9e7e0e0f43d1180aff131bf6b37cce3f6be6ded8f4d9257a5792ab93ad528602ec2525802180c75f302710e36fa2ef960c7
+  data.tar.gz: e5f8c61ec2fbd84a48301dd84bc608621a10a4ce493cd453c0a90b396dfb37914e81c709543d093ea4792f885f2bc809752869f08ddd2c186800990060e5c0f8

data/lib/railbox/handler/handler.rb

@@ -28,6 +28,14 @@ module Railbox
       def enqueue(method: 'create', body: {}, **opts)
         HandlingQueue.enqueue(service: name, method: method, body: body, **opts)
       end
+
+      # Base failure hook:
+      # - can be safely called even if not overridden in the service;
+      # - does nothing by default;
+      # - when overridden, has access to `outbox_entity`.
+      def on_failure
+        # no-op by default
+      end
     end
   end
 end

data/lib/railbox/models/transactional_outbox.rb

@@ -32,6 +32,12 @@ module Railbox
     class TransactionalOutbox < ::ActiveRecord::Base
       belongs_to :relative_entity, polymorphic: true, foreign_key: :entity_id, foreign_type: :entity_type
 
+      enum :status, {in_progress: 'in_progress', failed: 'failed', completed: 'completed'}
+
+      def action_data
+        super&.deep_symbolize_keys || {}
+      end
+
       def in_group?
         group.present? || entity_group.present?
       end

data/lib/railbox/mutators/transactional_outbox_mutator.rb

@@ -10,7 +10,7 @@ module Railbox
         def update(record, attributes)
           record.assign_attributes(attributes)
 
-          if record.status == 'in_progress'
+          if record.in_progress?
             record.attempts += 1
 
             if record.attempts >= Railbox.configuration.max_attempts

data/lib/railbox/processors/handler_processor.rb

@@ -1,17 +1,34 @@
 module Railbox
   module Processors
     class HandlerProcessor
+      extend ActiveSupport::Concern
+
       class << self
 
         def process(record)
-          interface             = Railbox::TransactionalOutboxInterface.new(record)
-          action_data           = record.action_data.deep_symbolize_keys!
-          handler               = Object.const_get(action_data[:class_name])
-          handler.outbox_entity = interface
+          with_handler(record) do |handler, action_data|
+            handler.public_send(action_data[:method_name])
+          end
+        end
+
+        def on_failure(record)
+          with_handler(record) do |handler, _action_data|
+            handler.on_failure
+          end
+        end
+
+        private
 
-          handler.public_send(action_data[:method_name])
+        def with_handler(record)
+          interface   = Railbox::TransactionalOutboxInterface.new(record)
+          action_data = record.action_data
+          handler     = Object.const_get(action_data[:class_name])
+
+          handler.outbox_entity = interface
 
-          handler.outbox_entity = nil
+          yield(handler, action_data)
+        ensure
+          handler.outbox_entity = nil if handler
         end
       end
     end

data/lib/railbox/processors/http_processor.rb

@@ -4,7 +4,7 @@ module Railbox
       class << self
 
         def process(record)
-          action_data = record.action_data.deep_symbolize_keys!
+          action_data = record.action_data
 
           Railbox::HttpClient::Faraday.request(action_data[:method_name],
                                                action_data[:url],
@@ -12,6 +12,9 @@ module Railbox
                                                record.body,
                                                record.headers)
         end
+
+        def on_failure(record)
+        end
       end
     end
   end

data/lib/railbox/workers/process_queue_worker.rb

@@ -12,11 +12,7 @@ module Railbox
             group.each do |record|
               process_record(record)
             rescue => e
-              TransactionalOutboxMutator.update(record, {failure_reasons: record.failure_reasons << { message: e.message, backtrace: e.backtrace&.take(3), at: DateTime.current}})
-              raise e if record.in_group? || record.action_type == 'handler'
-
-              Rails.logger.error("RailboxWorker error: #{e.message}\n #{e.backtrace&.take(3)&.join("\n")}")
-
+              on_failure(e, record)
               next
             end
           rescue => e
@@ -71,23 +67,34 @@ module Railbox
           all_group_records = scope.order(:created_at).to_a
 
           group_records if all_group_records.first&.id.in?(group_records.map(&:id))
-        end.compact.reject { |_k, v| v.blank? }
+        end.compact_blank
       end
 
       def process_record(record)
         Rails.logger.info("Start process with transactional outbox ID #{record.id}")
-        processor = PROCESSORS[record.action_type]
-
-        if processor
-          processor.process(record)
-        else
-          raise Railbox::QueueError, "Unknown action_type=#{record.action_type} for outbox #{record.id}"
-        end
+        take_processor(record).process(record)
 
         TransactionalOutboxMutator.update(record, {status: 'completed'})
 
         Rails.logger.info("Finish process with transactional outbox ID #{record.id}")
       end
+
+      def on_failure(error, record)
+        record = TransactionalOutboxMutator.update(record, {failure_reasons: record.failure_reasons << {message: error.message, backtrace: error.backtrace&.take(3), at: DateTime.current}})
+        take_processor(record).on_failure(record) if record.failed?
+
+        raise error if record.in_group? || record.action_type == 'handler'
+
+        Rails.logger.error("RailboxWorker error: #{error.message}\n #{error.backtrace&.take(3)&.join("\n")}")
+      end
+
+      def take_processor(record)
+        processor = PROCESSORS[record.action_type]
+
+        raise Railbox::QueueError, "Unknown action_type=#{record.action_type} for outbox #{record.id}" unless processor
+
+        processor
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Egor Beresnev