istox 0.1.156.2 → 0.1.156.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5daed90ec2d88ac9c15ab6829e93b1d91ceec8b3bbf0447e18a322bc23782676
-  data.tar.gz: 2b952122ec1ecad78de28d15e3bb239d521a7bbfbdf2323dff7407d70538548a
+  metadata.gz: 5f39e624095d20c469e1e24d3b61448c93f3a796175040e12b23a23814b3620a
+  data.tar.gz: 92c47cdde1b2fa375bdfaa328609fe2fab5ac5c8eb259bcf40297f29df6cb88e
 SHA512:
-  metadata.gz: 848726c06a306e5dfc451769f9392bc9c94716b8959da247e71681d4d932cc8fca2e1f8dd5cdded582c198c7bc53cc96dbd3e636c96943152213df4e1184e886
-  data.tar.gz: 717fe201a3068be826b51cfa008a2d9ecb57f2ceb25bcabf470458d0ed841378c695f2add1a2bcf20a74bb7a37a5721ebbcd6b7ef0006c64f1e31c56a470f944
+  metadata.gz: 7af1cc4e35bb038b358ecde3bebbc27693fb4bab7ec90fbd34a03052ca4f32f8ea5628f0be8b583eaa8fa6f9db18808d69241f4fcd6c024cd0a361e86de031f2
+  data.tar.gz: 01e83c80885c937736a6688032503855592ccbb1146e8ab36903031be87b1a02b168e79320178e1203bdb83cc95929d6bbe4a5faf1318b4540d1431ecbe19159

data/Gemfile.lock

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

data/lib/istox/helpers/publisher.rb

@@ -1,6 +1,9 @@
 require 'securerandom'
 require 'istox/helpers/logger'
 
+class RabbitMQPublishError < StandardError
+end
+
 module Istox
   # Publisher is relying on BunnyBoot to publish message, please make sure BunnyBoot is initalised properly first during runtime.
   class Publisher
@@ -179,13 +182,7 @@ module Istox
           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}"
-=begin
-          ::Istox::BunnyBoot.find_trackers("message_id:#{properties[:message_id]}").each do |key|
-            log.debug("On_return, update key #{key} in redis on status and retry counter")
-            ::Istox::BunnyBoot.update_tracker_by_status(key, 2)
-            ::Istox::BunnyBoot.update_tracker_incr_retry(key)
-          end
-=end
+
           if properties[:headers] && properties[:headers][:sender]
             @error = Hash.new if @error.nil?
             tid = properties[:headers][:sender]
@@ -204,7 +201,7 @@ module Istox
       end
 
       # Handle republish: check and increase retry count
-      def republish(ex, options = {}, message)
+      def republish(ex, options = {}, message, error)
         options[:headers] = {} if options[:headers].nil?
 
         if options[:headers][:republish].nil?
@@ -213,11 +210,12 @@ module Istox
         else
           options[:headers][:republish_count] += 1
           if options[:headers][:republish_count] > 10
-            log.info "Already retry to publish for 10 times, and give up retry"
+            log.fatal "Already retry to publish for 10 times, and give up retry"
             log.info "Publish options: #{options.inspect}"
             log.info "Publish to exchange: #{ex.name}"
             log.info "Publish payload: #{message.inspect}"
-            return false
+
+            raise RabbitMQPublishError, "Publish fails after retries(10): #{error}"
           end
         end
 
@@ -250,13 +248,13 @@ module Istox
           success = ex.channel.wait_for_confirms
           if success
             log.debug("Message confirm success: remove message for #{channel_id}")
-            # ::Istox::BunnyBoot.del_tracker_on_channel channel_id
-            # republish(ex, options, message)
             if @error.nil? || @error[Thread.current.object_id].nil?
+              # republish(ex, options, message, 'simulate errors')
               true
             else
+              error = @error[Thread.current.object_id][:return_info][:reply_text]
               @error[Thread.current.object_id] = nil
-              republish(ex,options,message)
+              republish(ex, options, message, error)
             end
           else
             ex.channel.nacked_set.each do |n|
@@ -264,18 +262,20 @@ module Istox
               # options = ::Istox::BunnyBoot.find_tracker_on_channel(channel_id, n, 'options')
               # options = JSON.parse(options, :symbolize_names => true)
               # options[:delivery_tag] = n
-              republish(ex, options, message)
+              republish(ex, options, message, 'broker processing fails')
             end
           end
         end
       rescue Bunny::ConnectionClosedError => e
-        log.debug "Publish fails due to #{e}"
+        log.error "Publish fails due to #{e}"
         # For network related retry, sleep 2 second before retry
         # Because it may take some seconds for automatic recovery of network
         sleep 2
-        republish(ex,options,message)
+        republish(ex, options, message, e.message)
+      rescue RabbitMQPublishError => e
+        raise RabbitMQPublishError, e.message
       rescue => e
-        log.debug "Publish error happening: #{e.message}"
+        log.error "Publish error happening: #{e.message}"
 
         # If the error indicates that the channel is already closed
         # then clear hash @channel and @exchange
@@ -287,7 +287,7 @@ module Istox
         end
 
         # Republish msg
-        republish(ex, options, message)
+        republish(ex, options, message, e.message)
       end
     end
   end

data/lib/istox/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.156.2
+  version: 0.1.156.3
 platform: ruby
 authors:
 - Siong Leng