bbk-amqp 1.0.0.79544 → 1.0.0.82233

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d7807a9dfeb65b4579d7db4993c28b2a73f7792c0cc2ce34d6f6b432754d6d
-  data.tar.gz: ebd605cba0dbfd1ba630e7ec12a9d7f8c69689aa0e7d5c5cbee88a85779fca46
+  metadata.gz: 1c4691eeb1a8c742af5a8678ed18f4ab9c198765e6e189716b972bfcdde3c409
+  data.tar.gz: 8fac5db1263e73f8e2fa5bf3aed867d297933cfd981ec364b559a5bc20959dc1
 SHA512:
-  metadata.gz: bceb60e98752cd3b27bfa283b88977ea9acc76effbcd543ce79658b1538196eb327f7b8e2a73c685a9d5730b125444c1c9cea6b35f37a598ef37653025804796
-  data.tar.gz: 4d76301d6c3d9bb301e51d2b86a51089198f69accce1b36f595f486f15ce9d726ae8aeabae94b1aa0bef666a0748e54f8748bb570fab8828c90683b3daa98a7f
+  metadata.gz: fa1ea15621d89c371748dc3b1227efcd2162d13ba10e761d0520cdaf51b97590f9af8205a119b15eb1e9f6ae897c9edad8b5b8aca44c9046c80e8233f0c7f651
+  data.tar.gz: 664f3ad951d06369bcbc3c1994b986a44a83ef32732eaf8ff95ecd4657c035de08e54dbcc49071e5df9c3cc6431e0d176322714d0c37e934d3326039aa9ec36e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.0.0.79544)
+    bbk-amqp (1.0.0.82233)
       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/publisher.rb

@@ -8,7 +8,7 @@ module BBK
     # Publisher send amqp messages
     class Publisher
 
-      HEADER_PROP_FIELDS = %i[user_id message_id reply_to correlation_id].freeze
+      HEADER_PROP_FIELDS = %i[message_id reply_to correlation_id].freeze
       PROTOCOLS = %w[mq amqp amqps].freeze
 
       attr_reader :connection, :domains, :logger, :channel, :ack_map, :sended_messages, :channel
@@ -72,7 +72,7 @@ module BBK
           mandatory:   true,
           routing_key: routing_key,
           headers:     message.headers,
-          user_id:     client_name, # если есть в headers, то на следующей строке будет перетерто
+          # user_id:     client_name,
           **message.headers.select {|k| HEADER_PROP_FIELDS.include? k }.compact
         }.merge(options).symbolize_keys
         send_message(exchange, routing_key, message.payload, properties)

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.79544
+  version: 1.0.0.82233
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-04-14 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