istox 0.1.130.pre.2 → 0.1.130.pre.3

data/Gemfile.lock

@@ -97,7 +97,7 @@ GEM
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.4-universal-darwin)
+    google-protobuf (3.11.4)
     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-universal-darwin)
+    grpc (1.27.0)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.27.0)

data/lib/istox/helpers/bunny_boot.rb

@@ -142,6 +142,12 @@ module Istox
         nil
       end
 
+      def queue_routing_key(consumer_key)
+        queue_config_from_consumer_key!(consumer_key)['routing_key'] || (queue_name consumer_key)
+      rescue
+        nil
+      end
+
       def queue_exclusive(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['exclusive'] || false
       rescue

data/lib/istox/helpers/publisher.rb

@@ -13,7 +13,7 @@ module Istox
       #   publish_confirm: true/false
       # }
       def publish(exchange: nil, routing_key: nil, binding:nil, binding_suffix:nil, message:, options: {})
-        log.debug '************************* Publish ************************'
+
         if exchange.nil? && routing_key.nil?
           raise 'Exchange and routing key cannot be nil at the same time.' if binding.nil?
           exchange = ::Istox::BunnyBoot.binding_exchange_id(binding)
@@ -24,7 +24,7 @@ module Istox
 
         exchange = ::Istox::BunnyBoot.search_exchange_of_routing_key!(routing_key) if routing_key.present? && exchange.nil?
         ex = exchange(exchange)
-        options[:routing_key] = routing_key unless routing_key.nil?
+        options[:routing_key] = routing_key unless routing_key.nil? || options[:routing_key]
 
         do_publish ex, options, message
       end
@@ -197,7 +197,6 @@ module Istox
       end
 
       def do_publish(ex, options = {}, message)
-        log.debug '************** do_publish ***************'
         eid = ::Istox::BunnyBoot.eid ex
         ch = ex.channel
         channel_id = ch.id
@@ -217,7 +216,6 @@ module Istox
         end
 
         if confirm && mode == 0
-          log.debug '************** Confirm && mode == 0 ***************'
           success = ex.channel.wait_for_confirms
           if success
             # ::Istox::BunnyBoot.del_tracker_on_channel channel_id
@@ -233,7 +231,6 @@ module Istox
             ret
           end
         end
-        log.debug '******************* End of do_publish ******************'
       rescue Bunny::ConnectionClosedError => e
         log.debug "Publish fails due to #{e}"
         sleep 1

data/lib/istox/helpers/subscriber.rb

@@ -76,7 +76,7 @@ module Istox
 
           # Bind queue to exchange
           queue_options = {}
-          queue_options[:routing_key] = queue_name if exchange_type == 'direct' || exchange_type == 'topic'
+          queue_options[:routing_key] = ::Istox::BunnyBoot.queue_routing_key consumer_key if exchange_type == 'direct' || exchange_type == 'topic'
           queue.bind exchange, queue_options
         end
 
@@ -88,7 +88,7 @@ module Istox
           end
           retry_queue = active_channel.queue("#{queue_name}.retry", arguments: {
               'x-dead-letter-exchange': letter_exchange,
-              'x-dead-letter-routing-key': "#{queue_name}",
+              'x-dead-letter-routing-key': ::Istox::BunnyBoot.queue_routing_key(consumer_key),
               'x-message-ttl': (::Istox::BunnyBoot.queue_retry_gap consumer_key)
           })
           unless exchange_name.nil?
@@ -163,7 +163,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
-            ::Istox::BunnyBoot.publish(exchange_retry, payload_object, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
+            ::Istox::BunnyBoot.publish(exchange_retry, processing_paylod, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
+          else
+            log.info ""
           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.130.pre.2'.freeze
+  VERSION = '0.1.130.pre.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.130.pre.2
+  version: 0.1.130.pre.3
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print