istox 0.1.157.2 → 0.1.157.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6d17e6c4d7ac569a5a12eef087e1ba3a2e4b0ddec42a0eb9514372d0c17f7a0
-  data.tar.gz: 32efb665603259cb2d60b12f96a89a6c54bc318104040e49f329b80d1187b983
+  metadata.gz: 8b2d25cfc82f9d7bf7bf206709b4e7fce25b0a08969182214b7c21cf2de9b438
+  data.tar.gz: 3da94d7e1152dc79773eadc6f8a9926d475ec68a112aa9ca5b5bc24abfb3daf9
 SHA512:
-  metadata.gz: 25dcfc87da877c162785e600a036bdbaca70c547a9b290eb1a181aec6bbd21c6ba0594425ab718f9fffaf42852901250867628c702671502aed7d3851c0f2dd1
-  data.tar.gz: 62feb8441876dd9bf5d0ee5b13e5a31c627d7f70dd0e5abc956c8ff7f1e91bbdf0cddea74ff0207b2c18afe81263417a87b19d649fb89b0bb334d487da2b1491
+  metadata.gz: e1784d28886f44447a7a0655ab744b22c2ecaf8c85a35db582aaaa34d6ca8788a76b312d2297d90079576376a6a59b0412ba58830ceaaae4c37aabf585d6e7cb
+  data.tar.gz: 426c27cf433ebc5f37ce3477dfcc0b90e86bb0a485d674ca1c42ccfae8f1f394f8c084df41b67e61a3453b103aeff36bbdfb2ce34e591df3168eedfd344cb472

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.157)
+    istox (0.1.157.5)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)

data/lib/istox/helpers/bunny_boot.rb

@@ -262,6 +262,7 @@ module Istox
         # For persistence, if exchange is durable, persistent is enabled
         # For mandatory. if channel is confirmed mode, mandatory is enabled
         persistent = e.durable?
+        persistent = true if eid(e) == :default
         mandatory = channel_confirm? e.channel
         options_dup = options.clone
 

data/lib/istox/helpers/logger.rb

@@ -8,6 +8,12 @@ module Istox
       @logger = ::Ougai::Logger.new(STDOUT)
       @logger.formatter = ::Ougai::Formatters::Readable.new unless ENV.fetch('RAILS_ENV','development') == 'production'|| (defined?(Rails) && Rails.env.production?)
 
+      # adding thread id to logger
+      @logger.before_log = lambda do |data|
+        data[:tracer_id] = Thread.current[:tracer_id]
+        data[:thread_id] = Thread.current.object_id
+      end
+
       @logger
     end
   end

data/lib/istox/helpers/messaging.rb

@@ -114,12 +114,29 @@ module Istox
             type: 'SEND_EMAIL_TEMPLATE',
             data: {
               template_name: template_name,
-              template_data_arr_json: template_data_arr.to_json,
+              template_data_arr_json: process_template_data_arr_for_copy_email(template_data_arr).to_json,
               attachments_json: attachments&.to_json
             }
           }
         )
       end
+
+      def process_template_data_arr_for_copy_email(template_data_arr)
+        copy_email_data_arr = []
+        template_data_arr.each do |email_data|
+          next unless email_data[:copy_emails].present?
+
+          email_data[:copy_emails].each do |ce|
+            copy_email_data = email_data.clone
+            copy_email_data[:email] = ce
+            copy_email_data.delete(:copy_emails)
+            copy_email_data_arr << copy_email_data
+          end
+
+          email_data.delete(:copy_emails)
+        end
+        template_data_arr.concat(copy_email_data_arr)
+      end
     end
   end
 end

data/lib/istox/helpers/subscriber.rb

@@ -51,13 +51,17 @@ module Istox
         queue_name = ::Istox::BunnyBoot.queue_name consumer_key
         queue_durable = ::Istox::BunnyBoot.queue_durable? consumer_key
         queue_exclusive = ::Istox::BunnyBoot.queue_exclusive consumer_key
+        priority = ::Istox::BunnyBoot.queue_priority consumer_key
+        arguments = {}
+        arguments['x-max-priority'] = priority unless priority.nil?
+
         begin
-          queue = active_channel.queue(queue_name, durable: queue_durable, exclusive: queue_exclusive || false)
+          queue = active_channel.queue(queue_name, durable: queue_durable, exclusive: queue_exclusive || false, arguments: arguments)
         rescue Bunny::PreconditionFailed => e
           # Must re-open a new channel, because now channel is already closed
           active_channel = ::Istox::BunnyBoot.channel(::Istox::BunnyBoot.connection, pool_size: pool_size, prefetch: prefetch)
           active_channel.queue_delete(queue_name)
-          queue = active_channel.queue(queue_name, durable: queue_durable)
+          queue = active_channel.queue(queue_name, durable: queue_durable, arguments: arguments)
         end
 
         # Declare exchange
@@ -105,10 +109,7 @@ module Istox
                                  end
         end
         # Subscribe queue
-        priority = ::Istox::BunnyBoot.queue_priority consumer_key
-        arguments = {}
-        arguments['x-max-priority'] = priority unless priority.nil?
-        queue.subscribe manual_ack: manual_ack, arguments: arguments do |delivery_info, metadata, payload|
+        queue.subscribe manual_ack: manual_ack do |delivery_info, metadata, payload|
           # For retried message, if reaching retry count limit, return ack anyway
           # If retry limit is -1, no retry limit
           # TODO: No matter the amount of retry limit, send cloudwatch critical alarm if fails after 3 times of retry

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.157.2'.freeze
+  VERSION = '0.1.157.7'.freeze
 end

metadata

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