istox 0.1.135 → 0.1.136

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea4ecfc5feab0cbc06336dadb22e0b4070951a0fe4f56293ffa0d1c2ddfe2e41
-  data.tar.gz: 40d4295b9dd6e08e094518681f568c893149031e6632357b9dda239975fdcf56
+  metadata.gz: 9ba46f77cb39ba25e26e78b1e1e614bc42ea8669a94f1b4a40e13fd7a392abed
+  data.tar.gz: 97a410fedb5e49e39fd460db6bed6b07af60b9a57b9c12a3ab59580bcf8f3a3b
 SHA512:
-  metadata.gz: ee86396ae458514e4b432e10b60cce8a2a5d800de2f685e7588338b7d0e63d2add4735566cf2276c147d69f7a0f79f443528e03461d30d3f73128aca255a4d88
-  data.tar.gz: e2f8ca172f526606ce70243a3b93eda0ce33f6a2e3746acd92f7e5300dc4529e9bb6da4dcf46a8661b89c014e1a748438ec579393d341136e1119c18de4f4eec
+  metadata.gz: 7b7e125e07dcb9d8ba066ce5db0799894f79c4f1fd15cec3fba54b2807b2a5b64006ee03ad62e72f9c349d0e69ddb8a194ab451d5f00f0e77bed05cdfbd15918
+  data.tar.gz: f16800de052e97d3faa0580901f41ee9de6855a162be3bbb8aeb77ebb3452266e3028b0990368c1c79182e9a6be1a3850cde2d5976892d16653db133a289ad2a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.134)
+    istox (0.1.136)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -97,7 +97,7 @@ GEM
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.4)
+    google-protobuf (3.11.4-universal-darwin)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.7)
@@ -108,7 +108,7 @@ GEM
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.27.0)
+    grpc (1.27.0-universal-darwin)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.27.0)

data/lib/istox/helpers/subscriber.rb

@@ -131,10 +131,6 @@ module Istox
         arguments = {}
         arguments['x-max-priority'] = priority unless priority.nil?
         queue.subscribe manual_ack: manual_ack, arguments: arguments do |delivery_info, metadata, payload|
-          log.debug "Delivery_info: #{delivery_info}"
-          log.debug "Metadata: #{metadata}"
-          log.debug "Payload: #{payload}"
-
           # For retried message, if reaching retry count limit, return ack anyway
           # 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
@@ -142,11 +138,16 @@ module Istox
           process = true
           store = true
           process = false if metadata[:priority] && retry_limit != -1 && metadata[:priority] >= retry_limit
-          if delivery_info[:routing_key] != queue_name
+          if delivery_info[:routing_key] && !delivery_info[:routing_key].empty? && 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
+
+          log.debug "Delivery_info: #{delivery_info}"
+          log.debug "Metadata: #{metadata}"
+          log.debug "Payload: #{payload}"
+
           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'
@@ -171,9 +172,11 @@ 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_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')
+            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'
+              ::Istox::BunnyBoot.publish(exchange_retry, processing_payload, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
+            end
           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.135'.freeze
+  VERSION = '0.1.136'.freeze
 end

metadata

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