bbk-amqp 1.0.0.72921 → 1.0.0.79546

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b2c6b051f57110604b1d26cf2630d3366c13011706fbe0fb9197900252b6e7
-  data.tar.gz: 62ea34dcbb14ab912ceebc56be7fc70f9e5e7fbc613f3009cf7cf88d19504467
+  metadata.gz: ff8bcca2839ed6b799122ae45b7815d91d6241ab3f42b3645ec17e5bbabb0320
+  data.tar.gz: 735a3c4c4718de1def889bf9e701fcf847ffc9dfb406a14ccc705d64e9290763
 SHA512:
-  metadata.gz: 58de9988370d0e84ed2a5be0b499376c7bd6defbb60798bf6b0d74f8ee044d49ab0b4ded2749ea6cd422428914e87a0e2622a41425581361c16227c9d44e2b7f
-  data.tar.gz: b5ecbe8e54c6473b8bf223a68a6a155d42b1ec8b78aa4e6c3e16ecccb99e8040f55a111dc9d6dc7e8f5212301a9ec6b147deabb1ecadf6923b2222f51ef97fc9
+  metadata.gz: 61c04f60792a0bcfcb28a0d2ca0e09a2eb3c46e7271bb73eb089d262397416c76d73ea2859b6e7e19f2450af82c17eed513f5bb40441141c694bf076afb48b4c
+  data.tar.gz: 9e7de36978f68bfdbe127059c4c9e7c1fe21a95a6c855c9b9e540ebc3561b933eea41d2ae66b262cec08cdcb5edeeb8437cea56f6884f22b25f5e1fb62fc9568

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.0.0.72921)
+    bbk-amqp (1.0.0.79546)
       activesupport (~> 6.0)
       bbk-utils (> 1.0.1)
       bunny (>= 2.19.0)

data/lib/bbk/amqp/consumer.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
+require 'bbk/amqp/rejection_policies/requeue'
 
 module BBK
   module AMQP
     class Consumer
 
-      attr_reader :connection, :queue_name, :queue, :options, :logger
+      attr_reader :connection, :queue_name, :queue, :rejection_policy, :options, :logger
 
       DEFAULT_OPTIONS = {
         consumer_pool_size:               3,
         consumer_pool_abort_on_exception: true,
         prefetch_size:                    10,
-        requeue_on_reject:                false,
-        consumer_tag:                     nil
+        consumer_tag:                     nil,
+        rejection_policy:                 RejectionPolicies::Requeue.new
       }.freeze
 
       PROTOCOLS = %w[mq amqp amqps].freeze
@@ -28,6 +29,7 @@ module BBK
         @queue_name = @queue&.name || queue_name
 
         @options = DEFAULT_OPTIONS.merge(options)
+        @rejection_policy = @options.delete(:rejection_policy)
 
         logger = @options.fetch(:logger, BBK::AMQP.logger)
         logger = logger.respond_to?(:tagged) ? logger : ActiveSupport::TaggedLogging.new(logger)
@@ -47,7 +49,7 @@ module BBK
           ch.prefetch(options[:prefetch_size])
         end
 
-        @logger.add_tags "Ch##{@channel.id}"
+        logger.add_tags "Ch##{@channel.id}"
 
         @queue ||= @channel.queue(queue_name, passive: true)
 
@@ -82,11 +84,8 @@ module BBK
 
       # Nack incoming message
       # @param incoming [BBK::AMQP::Message] nack procesing message
-      def nack(incoming, *args, error: nil, requeue: nil, **_kwargs)
-        logger.debug "Reject message #{incoming.headers[:type]}[#{incoming.headers[:message_id]}] delivery tag: #{incoming.delivery_info[:delivery_tag].to_i}. Error: #{error.inspect}"
-        requeue_message = requeue.nil? ? options[:requeue_on_reject] : requeue
-        incoming.delivery_info[:channel].reject incoming.delivery_info[:delivery_tag],
-                                                requeue_message
+      def nack(incoming, *args, error: nil, **_kwargs)
+        rejection_policy.call(incoming, error)
       end
 
       # stop consuming messages

data/lib/bbk/amqp/message.rb

@@ -33,12 +33,16 @@ module BBK
         headers[:reply_to]
       end
 
+      def user_id
+        headers[:user_id]
+      end
+
       def ack(*args, answer: nil, **kwargs)
         consumer.ack(self, *args, answer: answer, **kwargs)
       end
 
       def nack(*args, error: nil, **kwargs)
-        consumer.ack(self, *args, error: error, **kwargs)
+        consumer.nack(self, *args, error: error, **kwargs)
       end
 
     end

data/lib/bbk/amqp/rejection_policies/reject.rb

@@ -0,0 +1,20 @@
+module BBK
+  module AMQP
+    module RejectionPolicies
+      class Reject
+
+        attr_reader :logger
+
+        def initialize(logger: BBK::Utils::Logger.default)
+          @logger = logger
+        end
+      
+        def call(message, error)
+          logger.debug "Reject message #{message.headers[:type]}[#{message.headers[:message_id]}] delivery tag: #{message.delivery_info[:delivery_tag].to_i}. Error: #{error.inspect}"
+          message.delivery_info[:channel].reject message.delivery_info[:delivery_tag], false
+        end
+
+      end
+    end
+  end
+end

data/lib/bbk/amqp/rejection_policies/requeue.rb

@@ -0,0 +1,19 @@
+module BBK
+  module AMQP
+    module RejectionPolicies
+      class Requeue
+
+        attr_reader :logger
+
+        def initialize(logger: BBK::Utils::Logger.default)
+          @logger = logger
+        end
+
+        def call(message, error)
+          logger.debug "Requeue message #{message.headers[:type]}[#{message.headers[:message_id]}] delivery tag: #{message.delivery_info[:delivery_tag].to_i}. Error: #{error.inspect}"
+          message.delivery_info[:channel].reject message.delivery_info[:delivery_tag], true
+        end
+      end
+    end
+  end
+end

data/lib/bbk/amqp.rb

@@ -13,6 +13,8 @@ require 'bbk/amqp/route_info'
 require 'bbk/amqp/domains_set'
 require 'bbk/amqp/domains/exchange'
 require 'bbk/amqp/domains/by_block'
+require 'bbk/amqp/rejection_policies/reject'
+require 'bbk/amqp/rejection_policies/requeue'
 require_relative 'bunny_patch'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.0.0.72921
+  version: 1.0.0.79546
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -211,6 +211,8 @@ files:
 - lib/bbk/amqp/domains_set.rb
 - lib/bbk/amqp/message.rb
 - lib/bbk/amqp/publisher.rb
+- lib/bbk/amqp/rejection_policies/reject.rb
+- lib/bbk/amqp/rejection_policies/requeue.rb
 - lib/bbk/amqp/route_info.rb
 - lib/bbk/amqp/spec.rb
 - lib/bbk/amqp/spec/rabbit_helper.rb