istox 0.1.155.1 → 0.1.156.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77900ec4b0b82e5b1b7a1128c68ca5f8274c88336102c859ec10d29a8bde749e
-  data.tar.gz: 338432eb0c47851f7bdcaf066750b861d220e787f61769d56b8c816c4ce7004c
+  metadata.gz: 34b676607fe2ad0ce056c3bd9b04311e05e80e1a2d9f02aa6bbb850c220b2955
+  data.tar.gz: c8aa6a19a0e1723531b5004a541e4b56a7b2f285d97231f26e3a5fb2ab801d3e
 SHA512:
-  metadata.gz: 654a77d8521ffadd0f41a6d4c2c8186628a983c85472280cef98a03eb45b4d8373058b761bab544db6f4464abe4546976f37e9f5495e4025344b4b14012da739
-  data.tar.gz: 9c63efedc40d7d5e4bf04611234f8b97f517909fae3aad6d07af42cd4e1d22ffca8d286a3a924638009d1a01458d1a50f63774ffa4af6190eaad910630935afa
+  metadata.gz: 9ddb211b5311e592aa29370829407c79c940c633a99ed01fe977dbe83ff331a73978c2f0049233eed2269b6d44abdc914035ec3cfb9e4d146c6b812c07882bc9
+  data.tar.gz: 40ddec81359c780fc780b4c37c5e798b9c42b86cc9163fb58599c7ad2f2ee6c5b8d225f5023006beda9c9be8c97cb5545f31fc92bbb270f5cc15eb39fed3e4cc

data/Gemfile.lock

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

data/bulk-update-version.py

@@ -7,7 +7,8 @@ import os
 
 # HOW TO RUN: python bulk-update-version.py <version updating to, eg. 0.1.150.2>
 
-SERVICES = ["client-api", "admin-api", "message-api", "auth", "admin-auth"]
+SERVICES = ["client-api", "admin-api", "message-api",
+            "auth", "admin-auth", "banking-api", "trading-api"]
 
 
 def replace(file_path, pattern, subst):

data/lib/istox/helpers/bunny_boot.rb

@@ -56,6 +56,10 @@ module Istox
         ch
       end
 
+      def channel_confirm?(ch)
+        ch.using_publisher_confirmations?
+      end
+
       def exchange(eid)
         type = data[:exchanges][eid][:type]
         name = eid
@@ -254,29 +258,38 @@ module Istox
 
       def publish(e, message, options = {})
         eid = eid e
+        # By default:
+        # For persistence, if exchange is durable, persistent is enabled
+        # For mandatory. if channel is confirmed mode, mandatory is enabled
         persistent = e.durable?
-        mandatory = false
+        mandatory = channel_confirm? e.channel
+        options_dup = options.clone
+
         # Set Mandatory & Persistent flag for non-DLX and non-manual msg
-        unless %w[dlx manual].include? options[:type]
-          if options[:routing_key].present?
+        unless %w[dlx manual].include? options_dup[:type]
+          if options_dup[:routing_key].present?
             v1 = data['publish'][eid]
-            v1 = v1[options[:routing_key]] unless v1.nil?
-            persistent = v1['persistent'] unless v1.nil?
-            mandatory = v1['mandatory'] unless v1.nil?
+            v1 = v1[options_dup[:routing_key]] unless v1.nil? || v1[options_dup[:routing_key]].nil?
+            persistent = v1['persistent'] unless v1.nil? || v1['persistent'].nil?
+            mandatory = v1['mandatory'] unless v1.nil? || v1['mandatory'].nil?
           end
         end
-        options.merge!(persistent: persistent)
-        options.merge!(mandatory: mandatory)
+        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|
-          interceptor.call(message, options)
+          interceptor.call(message, options_dup)
         end
 
         message = JSON.dump message
-        log.debug "Publish options are: #{options}"
+        log.debug "Publish options are: #{options_dup}"
         log.debug "Publish message payload #{message}"
-        e.publish(message, options)
+        e.publish(message, options_dup)
 
         options[:message_id]
       end

data/lib/istox/helpers/formatter.rb

@@ -1,22 +1,24 @@
 module Istox
   class Formatter
     class << self
-      include ActionView::Helpers::NumberHelper
-
       # format a number, eg. 20000.134 > 20,000.14
-      def number(input, round_mode: :half_up, precision: 2)
+      def number(input, round_mode: :half_up, precision: 2, abs_num: false)
         BigDecimal.mode(BigDecimal::ROUND_MODE, round_mode)
 
         input = 0 if input.blank?
 
         input = ::BigDecimal.new(input.to_s).round(precision, round_mode)
 
-        number_with_precision(input, precision: precision, delimiter: ',')
+        input = input.abs if abs_num
+
+        result = format("%.#{precision}f", input)
+
+        result.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse
       end
 
-      # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind
-      def money(input, round_mode: :half_up, precision: 2, currency:, position: :front)
-        result = number(input, round_mode: round_mode, precision: precision)
+      # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind, abs_num: whether to absolute the number
+      def money(input, round_mode: :half_up, precision: 2, currency:, position: :front, abs_num: false)
+        result = number(input, round_mode: round_mode, precision: precision, abs_num: abs_num)
 
         return currency + ' ' + result if position == :front
 

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
@@ -104,7 +107,7 @@ module Istox
       def channel
         return @channel[Thread.current.object_id] if @channel.present? && @channel[Thread.current.object_id].present?
 
-        log.info "#{Thread.current.object_id} No channel yet, create 2 channels confirm-mode and non-confirm-mode ... ..."
+        log.info "Thread<#{Thread.current.object_id}> No channel yet, create 3 channels confirm-mode and non-confirm-mode ... ..."
         @channel = Hash.new if @channel.nil?
         @channel[Thread.current.object_id] = Hash.new
         @channel[Thread.current.object_id]['confirm-0'] = ::Istox::BunnyBoot.channel(connection, confirm: true)
@@ -174,38 +177,61 @@ 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|
-          # 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}"
-
-          # ::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
-
-          # publish(return_info[:exchange], return_info[:routing_key], content)
+          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}"
+
+          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
       end
 
-      def channel_confirm?(ch)
-        ch.using_publisher_confirmations?
-      end
-
       def channel_next_tag(ch)
         ch.next_publish_seq_no
       end
 
+      # Handle republish: check and increase retry count
+      def republish(ex, options = {}, message, error)
+        options[:headers] = {} if options[:headers].nil?
+
+        if options[:headers][:republish].nil?
+          options[:headers][:republish] = true
+          options[:headers][:republish_count] = 1
+        else
+          options[:headers][:republish_count] += 1
+          if options[:headers][:republish_count] > 10
+            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}"
+
+            raise RabbitMQPublishError, "Publish fails after retries(10): #{error}"
+          end
+        end
+
+        log.info "Retry to publish for <#{options[:headers][:republish_count]}> times"
+        do_publish(ex, options, message)
+      end
+
       def do_publish(ex, options = {}, message)
         eid = ::Istox::BunnyBoot.eid ex
         ch = ex.channel
         channel_id = ch.id
-        confirm = channel_confirm? ch
+        confirm =  ::Istox::BunnyBoot.channel_confirm? ch
         mode = confirm_mode eid
 
         ::Istox::BunnyBoot.publish(ex, message, options)
+=begin
         if confirm
           delivery_tag = channel_next_tag ch
           if options[:message_id].nil?
@@ -216,36 +242,52 @@ module Istox
             ::Istox::BunnyBoot.rename_tracker channel_id, options[:delivery_tag], delivery_tag
           end
         end
+=end
 
         if confirm && mode == 0
           success = ex.channel.wait_for_confirms
           if success
-            ::Istox::BunnyBoot.del_tracker_on_channel channel_id
+            log.debug("Message confirm success: remove message for #{channel_id}")
+            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, error)
+            end
           else
             ex.channel.nacked_set.each do |n|
               log.debug("Publish Error: UNACK delivery tag is #{n}, republish message")
-              options = ::Istox::BunnyBoot.find_tracker_on_channel(channel_id, n, 'options')
-              options = JSON.parse(options, :symbolize_names => true)
-              options[:delivery_tag] = n
-              do_publish(ex, options, message)
+              # 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, 'broker processing fails')
             end
           end
         end
       rescue Bunny::ConnectionClosedError => e
-        log.debug "Publish fails due to #{e}"
-        sleep 1
-        do_publish(ex,options,message)
+        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, e.message)
+      rescue RabbitMQPublishError => e
+        raise RabbitMQPublishError, e.message
       rescue => e
-        log.debug "Error happens: #{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
+        # re-create channel and re-declare exchange on that channel 
         if e.message.include? "cannot use a closed channel"
           @channel.delete Thread.current.object_id
           @exchanges.delete Thread.current.object_id
           ex = exchange(eid)
-          do_publish(ex, options, message)
         end
+
+        # Republish msg
+        republish(ex, options, message, e.message)
       end
     end
   end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.155.1'.freeze
+  VERSION = '0.1.156.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.155.1
+  version: 0.1.156.4
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print