bbk-amqp 1.0.0.105635 → 1.0.0.105722

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c811344d310285b4a69c8b17bb80a0052fc7b263822d870feb9247dfea817f51
-  data.tar.gz: 3e43954cb05ea14a49f34ff24efedacf10c7be5f578634c7172c5c2f513e95a8
+  metadata.gz: c548372181f2dd8188ed0aee86a514a0cf9d2d533d534211cd00d3e2137f1945
+  data.tar.gz: 2afa60b894ff011b639ea8f1a9de931570feb4bbe2ddd6c2061474ac3d01f0a9
 SHA512:
-  metadata.gz: fa9a1ef97bdf617db36bcc87ae0a60ab235f1872187906ac2b3b566683c47980e64fc00a3134230bc396cc775f505d69727cd8d0944e36566f2fdc931df5a165
-  data.tar.gz: 8805a42fefe4803447b7bc786a1a965b1877e2912b294430d39dce39610453272f58708f83c0674856b7e1343e4be070fb372b4e955f12eab1bb3921bb3c16bb
+  metadata.gz: 06be7f99a98d9a80a0414c2bc96ec4990fd6c50177ff89c8e8462b20a00e445449532008c70873e23f9b26102655858d0f35b80c1e9fbb89c4729ab1281cda56
+  data.tar.gz: 1a9d618b0561e1fba5da9d23ad5c5000b2e66ef4e8a23657447968f74762539f249b98aecd307fd53fb2491d8adbeb1a10fdce2fca2d752ffe312cc76c7d1db0

data/Gemfile.lock

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

data/lib/bbk/amqp/utils.rb

@@ -14,17 +14,26 @@ 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
         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.105635
+  version: 1.0.0.105722
 platform: ruby
 authors:
 - Samoylenko Yuri