istox 0.1.156.1 → 0.1.156.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.156)
+    istox (0.1.156.2)
       amazing_print
       awesome_print
       binding_of_caller

data/lib/istox/helpers/bunny_boot.rb

@@ -276,6 +276,10 @@ module Istox
         end
         options_dup.merge!(persistent: persistent)
         options_dup.merge!(mandatory: mandatory)
+
+        options_dup[:headers] = {} if options[:headers].nil?
+        options_dup[:headers][:sender] = Thread.current.object_id
+
         # message.merge!(locale: I18n.locale)
 
         publisher_interceptors.each do |interceptor|

data/lib/istox/helpers/publisher.rb

@@ -174,8 +174,8 @@ module Istox
         # when an unroutable message is returned, the BasicReturn is fired first and then an ack is sent, firing the BasicAck second.
         # So if the current status is unroutable then we need to make sure that we don't overwrite that status with Success (ack).
         ex.on_return do |return_info, properties, content|
-          return_info = return_info.to_hash
-          properties = properties.to_hash
+          return_info = return_info.to_hash.deep_symbolize_keys
+          properties = properties.to_hash.deep_symbolize_keys
           log.debug "Got a returned message info: #{return_info}"
           log.debug "Got a returned message properties: #{properties}"
           log.debug "Got a returned message content: #{content}"
@@ -186,9 +186,14 @@ module Istox
             ::Istox::BunnyBoot.update_tracker_incr_retry(key)
           end
 =end
-          options = properties.clone
-          options[:routing_key] = return_info[:routing_key]
-          republish(ex, options, content)
+          if properties[:headers] && properties[:headers][:sender]
+            @error = Hash.new if @error.nil?
+            tid = properties[:headers][:sender]
+            @error[tid] = Hash.new if @error[Thread.current.object_id].nil?
+            @error[tid][:return_info] = return_info
+            @error[tid][:properties] = properties
+            @error[tid][:content] = content
+          end
         end
 
         exchanges[id] = ex
@@ -247,7 +252,12 @@ module Istox
             log.debug("Message confirm success: remove message for #{channel_id}")
             # ::Istox::BunnyBoot.del_tracker_on_channel channel_id
             # republish(ex, options, message)
-            true
+            if @error.nil? || @error[Thread.current.object_id].nil?
+              true
+            else
+              @error[Thread.current.object_id] = nil
+              republish(ex,options,message)
+            end
           else
             ex.channel.nacked_set.each do |n|
               log.debug("Publish Error: UNACK delivery tag is #{n}, republish message")

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.156.1'.freeze
+  VERSION = '0.1.156.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.156.1
+  version: 0.1.156.2
 platform: ruby
 authors:
 - Siong Leng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -524,7 +524,7 @@ files:
 homepage: http://www.abc.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -539,8 +539,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: istox backend shared gem
 test_files: []