istox 0.1.156.5 → 0.1.157.4

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    istox (0.1.156.3)
+    istox (0.1.157.4)
       amazing_print
       awesome_print
+      aws-sdk-sns (~> 1)
       binding_of_caller
       bunny (>= 2.12.0)
       exponential-backoff (= 0.0.4)
@@ -63,8 +64,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amazing_print (1.2.0)
-    amq-protocol (2.3.1)
+    amazing_print (1.2.1)
+    amq-protocol (2.3.2)
     arel (9.0.0)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
@@ -74,6 +75,9 @@ GEM
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
+    aws-sdk-sns (1.24.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
     aws-sdk-xray (1.4.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
@@ -82,13 +86,14 @@ GEM
     aws-xray-sdk (0.11.4)
       aws-sdk-xray (~> 1.4.0)
       multi_json (~> 1)
+    bigdecimal (2.0.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     bullet (5.7.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    bunny (2.15.0)
+    bunny (2.16.1)
       amq-protocol (~> 2.3, >= 2.3.1)
     byebug (11.1.3)
     coderay (1.1.2)
@@ -115,21 +120,21 @@ GEM
     ffi (1.13.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.12.2-universal-darwin)
+    google-protobuf (3.13.0-universal-darwin)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
     graphlient (0.4.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.10.10)
+    graphql (1.11.3)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.28.0-universal-darwin)
-      google-protobuf (~> 3.11)
+    grpc (1.31.1-universal-darwin)
+      google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.28.0)
+    grpc-tools (1.31.1)
     gruf (2.8.1)
       activesupport (> 4)
       concurrent-ruby (> 1)
@@ -166,7 +171,8 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.6)
+    oj (3.10.9)
+      bigdecimal (~> 2.0)
     ougai (1.8.5)
       oj (~> 3.10)
     paranoia (2.4.2)
@@ -218,16 +224,16 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.7.0)
+    redis-namespace (1.8.0)
       redis (>= 3.0.4)
-    redis-rack (2.1.2)
+    redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.8.2)
+    redis-store (1.9.0)
       redis (>= 4, < 5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -250,7 +256,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    slop (4.8.1)
+    slop (4.8.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -265,7 +271,7 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.14.0)
+    vault (0.15.0)
       aws-sigv4
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)

data/istox.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'amazing_print'
   spec.add_dependency 'awesome_print'
+  spec.add_dependency 'aws-sdk-sns', '~> 1'
   spec.add_dependency 'binding_of_caller'
   spec.add_dependency 'bunny', '>= 2.12.0'
   spec.add_dependency 'exponential-backoff', '0.0.4'

data/lib/istox.rb

@@ -16,6 +16,7 @@ module Istox
   require 'istox/helpers/logger'
   require 'istox/interfaces/chainhub/transaction'
   require 'istox/helpers/publisher'
+  require 'istox/helpers/sns_publisher'
   require 'istox/helpers/subscriber'
   require 'istox/helpers/bunny_boot'
   require 'istox/helpers/rate_limit'

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

@@ -0,0 +1,38 @@
+require 'aws-sdk-sns'
+
+module Istox
+  class SnsPublisher
+    class << self
+      # exception will not be thrown if throw_exception is set to false, exception will only be printed out and swallowed
+      def publish(message, topic_arn: nil, throw_exception: false)
+        if message.nil?
+          log.info('No message to publish, skipping SNS publish now...')
+          return
+        end
+
+        log.info('Publishing to SNS...')
+
+        message = JSON.generate(message) unless message.is_a? String
+
+        sns_client.publish({ topic_arn: topic_arn || ENV.fetch('PUSHER_TOPIC_ARN', ''), message: message })
+
+        log.info('Publish to SNS successfully.')
+      rescue StandardError => e
+        log.fatal 'Unable to publish SNS message.'
+        log.fatal(e)
+        log.info('Failed to publish SNS, ignoring...') unless throw_exception
+
+        raise e if throw_exception
+      end
+
+      def sns_client
+        return @sns_client if @sns_client.present?
+
+        Aws.config.update({ region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
+                            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
+    end
+  end
+end

data/lib/istox/helpers/subscriber.rb

@@ -51,8 +51,12 @@ 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)
@@ -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.156.5'.freeze
+  VERSION = '0.1.157.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.156.5
+  version: 0.1.157.4
 platform: ruby
 authors:
 - Siong Leng
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-sns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
@@ -509,6 +523,7 @@ files:
 - lib/istox/helpers/regex_helper.rb
 - lib/istox/helpers/remote_model_cache.rb
 - lib/istox/helpers/result_handler.rb
+- lib/istox/helpers/sns_publisher.rb
 - lib/istox/helpers/subscriber.rb
 - lib/istox/helpers/vault.rb
 - lib/istox/helpers/xray/grpc_client_xray_interceptor.rb
@@ -524,7 +539,7 @@ files:
 homepage: http://www.abc.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -539,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: []