istox 0.1.156 → 0.1.156.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.156)
+    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/consumers/blockchain_status_handler.rb

@@ -88,7 +88,7 @@ module Istox
       end
 
       def mark_resource_handled(receipt)
-        receipt.update(resource_handled: true)
+        receipt.reload.update(resource_handled: true)
       rescue StandardError => e
         log.warn "Unable to update resource_handled for receipt #{receipt.inspect},
         but will silently ignore the error"

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/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
@@ -174,21 +177,20 @@ 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}"
-=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)
+
+          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
-          options = properties.clone
-          options[:routing_key] = return_info[:routing_key]
-          republish(ex, options, content)
         end
 
         exchanges[id] = ex
@@ -199,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?
@@ -208,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
 
@@ -245,27 +248,34 @@ 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)
-            true
+            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
-              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
@@ -277,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'.freeze
+  VERSION = '0.1.156.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.156
+  version: 0.1.156.5
 platform: ruby
 authors:
 - Siong Leng
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-08-16 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.8
-signing_key:
+rubygems_version: 3.0.6
+signing_key: 
 specification_version: 4
 summary: istox backend shared gem
 test_files: []