bbk-amqp 1.0.0.105683 → 1.0.0.105723

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0cf40f223ad98321c2585561830b848c5f5f910c3735e58f25e89c10c27495
-  data.tar.gz: f5557d4fcdc315583d2d3dece0162e1a5316a149b901cf9a6da7b23caa51a22d
+  metadata.gz: 2f1da8aba8b479f41ed976777c38ce799d5564a4f851351f3ee9d1e068b38e33
+  data.tar.gz: 97b64ced709b1ff88b9a02bd444de9826944a0af906c695625a4d3d0978062f2
 SHA512:
-  metadata.gz: 85a5f458d11e8b29765478aa79ff70f9b6b5d1cf35905172ca7801fe8f697cc07ea1009131f369c16cb99e5a243ddf7c2ef4c48fe16ae9ce62912b5ee1a4c21a
-  data.tar.gz: 3e576a2335e29c111fcfba695b9ff4866f588f623117f010b7b5cc87c8974e27e7917966ddb9eda6e87eaadeb2c1b265dfaf3cd5ae58c92a2ea90fc9ae3ee17e
+  metadata.gz: ab0d20cb16a171f6b2e4cafec6d0fd5038994e28d1891753a89efceffeedb71bcf58370385fec709fab694f059111a3e1f4f829eb6eabbfe98d4ee5d17ed414f
+  data.tar.gz: 1234c97fb4ee02cf9cd3b85d5e5ff67ab6ce5ce12f73323b1bf961b4c9dea84c7240d0951dc05a6832669de4868953006e4d599595825262dc05612ca487978a

data/Gemfile.lock

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

data/lib/bbk/amqp/utils.rb

@@ -14,17 +14,28 @@ module BBK
       # @return [Array] array with delivery_info, metadata and payload
       def self.pop(queue, timeout = 10)
         unblocker = Queue.new
+        consumed = false
+        mx = Mutex.new
+        # Если сообщений несколько то порядок может поменяться и это нужно иметь в виду.
+        # Решить можно создав, отдельный канал с qos 1.
         consumer = queue.subscribe(block: false, manual_ack: true) do |delivery_info, metadata, payload|
-          message = [
-            delivery_info,
-            metadata.to_hash.with_indifferent_access,
-            begin
-              Oj.load(payload).with_indifferent_access
-            rescue StandardError
-              payload
+          mx.synchronize do
+            if consumed
+              queue.channel.nack(delivery_info.delivery_tag, false, true)
+              break
             end
-          ]
-          unblocker << message
+            consumed = true
+            message = [
+              delivery_info,
+              metadata.to_hash.with_indifferent_access,
+              begin
+                Oj.load(payload).with_indifferent_access
+              rescue StandardError
+                payload
+              end
+            ]
+            unblocker << message
+          end
         end
         Thread.new do
           sleep timeout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.0.0.105683
+  version: 1.0.0.105723
 platform: ruby
 authors:
 - Samoylenko Yuri