bbk-amqp 1.0.0.76397 → 1.0.0.81661

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c678673dd8626dfe4a02358a9e82ec22af146018393cd1000d6bc4648018b14
-  data.tar.gz: 42a917f7a3409409b95bd0a20baeac4dbb58ae08da50ad6082a6a2e1b210196a
+  metadata.gz: 7383eceef602da4c6dfb5c6bfa31b161f7f97fc75391f0215b769a2807e644ef
+  data.tar.gz: 56b88eba1ac97a16183d1e9471462adfa2d99c38a24678b9fafde8ebec4aaa0e
 SHA512:
-  metadata.gz: fe7404e990e10cebd16a928aafdcf91c82804b3bb4e6c9916f5e069f2e19f3b200849583b9dc98e8f36ca048dd3abed5bf296e1dfcb33e949df2c8e697bf683e
-  data.tar.gz: 83e7c1446e5e25e99084022517d97b5b02c3079b6f281ec20c1533f54c6bc768064227dcc2e92567e50655f6cb69f5d8e85cf1a0922bca0df26f8954a9dda3da
+  metadata.gz: 6ce4f910058005cb9ca048810370cf9447bae4fe176bcd0fcaa4cdff35271aa55c3b94abe11e6a28d3c16f825f414d10c93f8d1d99157554070d5b70d887e5e8
+  data.tar.gz: bfc30528d0873325b5b860f7d18a206b5cd52a05edb2df83f7c3a4d6b95625a4fd1367a7af0ef5f8ebf07827be9464388dc6d4121d0e62ae62928e87976c81ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.0.0.76397)
+    bbk-amqp (1.0.0.81661)
       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,14 +49,15 @@ 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)
 
         subscribe_opts = {
           block:        false,
           manual_ack:   true,
-          consumer_tag: options[:consumer_tag]
+          consumer_tag: options[:consumer_tag],
+          exclusive: options.fetch(:exclusive, false)
         }.compact
 
         logger.info 'Starting...'
@@ -82,11 +85,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

@@ -42,7 +42,7 @@ module BBK
       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.76397
+  version: 1.0.0.81661
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-04-08 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