istox 0.1.134 → 0.1.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a20392d2531872f0931ae534352ee8e42b30dc1ee72def8e7fea39879148915
-  data.tar.gz: 57625d60cec35ba285ab6b892aa7265ab96158a2f885cbf3a70127c7fdb6d6cc
+  metadata.gz: ea4ecfc5feab0cbc06336dadb22e0b4070951a0fe4f56293ffa0d1c2ddfe2e41
+  data.tar.gz: 40d4295b9dd6e08e094518681f568c893149031e6632357b9dda239975fdcf56
 SHA512:
-  metadata.gz: ef4df22baed5bd4c590bfded9318ecbc3f3bc7c72a2aa451ce3a64b50c3b94461ae6c6f51ed5a4d293d5410324b44336c6e5035844ef127c500f2db85a0ee6ac
-  data.tar.gz: d72f536ce57c150ae7f33cddceacae709c504384acbc21ccd03d0cc89696007eebe0635b59775f51834d5642a9dde1c4e1d2d85ff85f67a220d7164d9500eb18
+  metadata.gz: ee86396ae458514e4b432e10b60cce8a2a5d800de2f685e7588338b7d0e63d2add4735566cf2276c147d69f7a0f79f443528e03461d30d3f73128aca255a4d88
+  data.tar.gz: e2f8ca172f526606ce70243a3b93eda0ce33f6a2e3746acd92f7e5300dc4529e9bb6da4dcf46a8661b89c014e1a748438ec579393d341136e1119c18de4f4eec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.133)
+    istox (0.1.134)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)

data/lib/istox/helpers/subscriber.rb

@@ -139,17 +139,25 @@ module Istox
           # If retry limit is -1, no retry limit
           # TODO: No matter the amount of retry limit, send cloudwatch critical alarm if fails after 3 times of retry
           retry_limit = ::Istox::BunnyBoot.queue_retry_limit consumer_key
-          unless metadata[:priority] && retry_limit != -1 && metadata[:priority] >= retry_limit
-            processing_paylod = JSON.parse(payload)
-            processing_paylod = ::Istox::CommonHelper.to_open_struct(processing_paylod) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
-            log.info "Processing in consumer: #{klass}, paylod: #{processing_paylod.to_h.inspect}"
+          process = true
+          store = true
+          process = false if metadata[:priority] && retry_limit != -1 && metadata[:priority] >= retry_limit
+          if delivery_info[:routing_key] != queue_name
+            log.debug "Get retry message from other queue #{delivery_info[:routing_key]}, just ignore!!"
+            process = false
+            store = false
+          end
+          if process
+            processing_payload = JSON.parse(payload)
+            processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+            log.info "Processing in consumer: #{klass}, payload: #{processing_payload.to_h.inspect}"
             if @workers[ruby_class].nil?
-              result = block.call(processing_paylod, metadata, delivery_info) unless block.nil?
+              result = block.call(processing_payload, metadata, delivery_info) unless block.nil?
             else
-              result = @workers[ruby_class].process(processing_paylod, metadata, delivery_info)
+              result = @workers[ruby_class].process(processing_payload, metadata, delivery_info)
             end
           else
-            ::Istox::BunnyBoot.cacheMsg(Time.now.to_s, {queue: queue.name, payload: payload})
+            ::Istox::BunnyBoot.cacheMsg(Time.now.to_s, {queue: queue.name, payload: payload}) if store
           end
           # active_channel.ack(delivery_info.delivery_tag) if manual_ack
         rescue StandardError => e
@@ -163,9 +171,9 @@ module Istox
             log.debug "Consumer Retry count: #{retry_count}"
             # @option opts [Integer] :priority Message priority, 0 to 9. Not used by RabbitMQ, only applications
             # here we adopt the unused priority as remaining retry_count
-            processing_paylod = JSON.parse(payload)
-            processing_paylod = ::Istox::CommonHelper.to_open_struct(processing_paylod) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
-            ::Istox::BunnyBoot.publish(exchange_retry, processing_paylod, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
+            processing_payload = JSON.parse(payload)
+            processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+            ::Istox::BunnyBoot.publish(exchange_retry, processing_payload, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
           end
 =begin
           # For redelivered message, call 'reject' not 'nack' in order to reschedule message to tail not head of queue

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.134'.freeze
+  VERSION = '0.1.135'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.134
+  version: 0.1.135
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print