istox 0.1.157 → 0.1.157.5

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

@@ -139,8 +139,8 @@ module Istox
         name = queue_config_from_consumer_key!(consumer_key)['queue_name']
         return name if name.nil?
 
-        prefix = queue_config_from_consumer_key!(consumer_key)['queue_prefix']
-        suffix = queue_config_from_consumer_key!(consumer_key)['queue_suffix']
+        prefix = queue_config_from_consumer_key!(consumer_key, true)['queue_prefix']
+        suffix = queue_config_from_consumer_key!(consumer_key, true)['queue_suffix']
         delimiter = queue_config_from_consumer_key!(consumer_key)['queue_delimiter'] || '' unless prefix.nil? && suffix.nil?
 
         name = "#{prefix}#{delimiter}#{name}" unless prefix.nil?
@@ -157,7 +157,7 @@ module Istox
       end
 
       def queue_worker_param(consumer_key)
-        queue_config_from_consumer_key!(consumer_key)['worker_param']
+        queue_config_from_consumer_key!(consumer_key, true)['worker_param']
       rescue StandardError
         nil
       end
@@ -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
 
@@ -365,17 +366,21 @@ module Istox
 
       private
 
-      def data
+      def data(load_from_disk = false)
         Hashie.logger.level = 'ERROR'
-        @data = Hashie::Mash.new(
-          YAML.safe_load(
-            ERB.new(File.read(ENV['AMQP_CONFIG'] || 'config/amqp.yml')).result
+        if load_from_disk || @data.nil?
+          @data = Hashie::Mash.new(
+            YAML.safe_load(
+              ERB.new(File.read(ENV['AMQP_CONFIG'] || 'config/amqp.yml')).result
+            )
           )
-        )
+        end
+
+        @data
       end
 
-      def queue_config_from_consumer_key!(consumer_key)
-        queue_config = data['queues'][consumer_key]
+      def queue_config_from_consumer_key!(consumer_key, load_from_disk = false)
+        queue_config = data(load_from_disk)['queues'][consumer_key]
 
         raise "Queue for key #{consumer_key} config not found, have you forgotten to define the queue in amqp.yml?" if queue_config.nil?
 

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/sns_publisher.rb

@@ -29,7 +29,7 @@ module Istox
         return @sns_client if @sns_client.present?
 
         Aws.config.update({ region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
-                            credentials: Aws::Credentials.new('AWS_STS_ACCESS_KEY_ID', 'AWS_STS_SECRET_ACCESS_KEY') })
+                            credentials: Aws::Credentials.new(ENV.fetch('AWS_STS_ACCESS_KEY_ID'), ENV.fetch('AWS_STS_SECRET_ACCESS_KEY')) })
 
         @sns_client = Aws::SNS::Client.new(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'))
       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'.freeze
+  VERSION = '0.1.157.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.157
+  version: 0.1.157.5
 platform: ruby
 authors:
 - Siong Leng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-10 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,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: []