istox 0.1.90 → 0.1.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b135382a878056bd557369e7e9e402786e7c7ebb7ede4ba72da3eb9ae1ad48
-  data.tar.gz: 6ad41087a7a7de2ea965019c9e2a453d36fb7abe749a2c9f8227d3bec3dcd301
+  metadata.gz: 953e7048e61191271768cd7520e88ddaac59ce5acca87e20f120d6b29803816d
+  data.tar.gz: a8af789c79d79ce1145f2403a7c55267060ebcc14ea80f40beb839fc5c119506
 SHA512:
-  metadata.gz: 2e8270a43e58ddc2053f7d6eb7260571975144d86e10db7fd61a768ed7c032f3cf852c1aa6ade1d4b7534e9926df910c4b5737d84569631bf2fd654ef09338b7
-  data.tar.gz: '078e26586b8c9ce0e56f77ee90f9c91eb12d592e76e522ec0f27c4d2e0e2c5cdaa6d06452dd34b54055ebdd11b96c8c0085b7304139862b220f703115e8faa19'
+  metadata.gz: 74ba49c25deedb38307c09a80415dacd01daae236d6cd121230bee3e185f2047d7230d2a17b196ec0f3441512ba2c04b876485c0469c743a40991944cc176523
+  data.tar.gz: 6638dde7e5b00304795605a7734446acabfe6c94c6862c2211e5caf64531eeca2ffdbaf12ac1a913974c0a973b84633df76fdf014e0ab8982d3730a14b6a3128

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.89)
+    istox (0.1.91)
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient

data/lib/istox.rb

@@ -29,7 +29,5 @@ module Istox
   require 'istox/models/blockchain_receipt'
   require 'istox/models/concerns/blockchain_receipt_query'
   require 'istox/consumers/blockchain_status_handler'
-  require 'istox/logging/hash_logging'
-  require 'istox/logging/log_formatter'
   require 'istox/quant/bond'
 end

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -68,17 +68,17 @@ module Istox
           }
         )
       rescue StandardError => e
-        Rails.logger.error "Unable to publish to frontend for receipt #{receipt.inspect},
+        Rails.logger.warning "Unable to publish to frontend for receipt #{receipt.inspect},
         but will silently ignore the error"
-        Rails.logger.error e
+        Rails.logger.warning e
       end
 
       def mark_resource_handled(receipt)
         receipt.update(resource_handled: true)
       rescue StandardError => e
-        Rails.logger.error "Unable to update resource_handled for receipt #{receipt.inspect},
+        Rails.logger.warning "Unable to update resource_handled for receipt #{receipt.inspect},
         but will silently ignore the error"
-        Rails.logger.error e
+        Rails.logger.warning e
       end
 
       def resource_handled?(receipt)

data/lib/istox/helpers/bunny_boot.rb

@@ -2,7 +2,6 @@ require 'bunny'
 module Istox
   class BunnyBoot
     class << self
-
       def initialize!(amqp_config_path)
         @@amqp_config_path = amqp_config_path
         ::Istox::Publisher.initialize!(amqp_config_path)
@@ -21,7 +20,7 @@ module Istox
       def subscribe_to_queues
         data.queues.each do |data|
           config = OpenStruct.new(data[1])
-          klass = Object.const_get("::" + "#{data[0]}_consumer".camelize)
+          klass = Object.const_get('::' + "#{data[0]}_consumer".camelize)
           exchange_type = if config.exchange.ends_with?('.fanout')
                             :fanout
                           else
@@ -33,25 +32,21 @@ module Istox
             config.name,
             durable: config.durable
           ).bind(exchange(config.exchange, exchange_type), options)
-          
+
           manual_ack = true
-          if !config.manual_ack.nil?
-            manual_ack = config.manual_ack
-          end
+          manual_ack = config.manual_ack unless config.manual_ack.nil?
 
           queue.subscribe manual_ack: manual_ack do |delivery_info, metadata, payload|
-            begin
-              Rails.logger.info("Processing in consumer: #{klass}")
-              klass.new.process(
-                Hashie::Mash.new(JSON.parse(payload)),
-                metadata,
-                delivery_info
-              )
-              $channel.ack(delivery_info.delivery_tag) if manual_ack
-            rescue Exception => e
-              Rails.logger.error(e)
-              $channel.nack(delivery_info.delivery_tag, false, true)
-            end
+            Rails.logger.debug("Processing in consumer: #{klass}")
+            klass.new.process(
+              Hashie::Mash.new(JSON.parse(payload)),
+              metadata,
+              delivery_info
+            )
+            $channel.ack(delivery_info.delivery_tag) if manual_ack
+          rescue StandardError => e
+            Rails.logger.error(e)
+            $channel.nack(delivery_info.delivery_tag, false, true)
           end
         end
       end
@@ -76,4 +71,4 @@ module Istox
       end
     end
   end
-end
+end

data/lib/istox/helpers/graphql_client.rb

@@ -13,12 +13,12 @@ module Istox
 
         raise "Please make sure you have initialised graphql cient for host #{host_type}" unless client
 
-        Rails.logger.info "Querying Graphql host: #{host_type}, query: #{query}, variables: #{variables.inspect}"
+        Rails.logger.debug "Querying Graphql host: #{host_type}, query: #{query}, variables: #{variables.inspect}"
         result = client.query(query, variables)
 
         return_values = ::Istox::CommonHelper.to_open_struct(result&.data)
 
-        Rails.logger.info "Graphql result: #{return_values.inspect}"
+        Rails.logger.debug "Graphql result: #{return_values.inspect}"
 
         return_values
       end

data/lib/istox/helpers/grpc_client.rb

@@ -18,14 +18,14 @@ module Istox
       private
 
       def execute(host_type, service, method, **keyword_args)
-        Rails.logger.info "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
+        Rails.logger.debug "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
         t1 = Time.now
 
         result = get_host(host_type, service).call(method, keyword_args)
-        Rails.logger.info "Time taken for grpc execution: #{Time.now - t1} seconds"
+        Rails.logger.debug "Time taken for grpc execution: #{Time.now - t1} seconds"
 
         return_values = ::Istox::CommonHelper.to_open_struct(result.message)
-        Rails.logger.info "Result: #{return_values}"
+        Rails.logger.debug "Result: #{return_values}"
 
         return_values
       end
@@ -49,10 +49,10 @@ module Istox
         host_url = @@hosts[host_type]
         raise StandardError, 'Unable to find host, have you forgotten to add host to grpc client?' unless host_url
 
-        Rails.logger.info 'Reinitiating to grpc host at ' + host_url
+        Rails.logger.debug 'Reinitiating to grpc host at ' + host_url
         t1 = Time.now
         @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url })
-        Rails.logger.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
+        Rails.logger.debug "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
       end
 
       def get_key(host_type, service)

data/lib/istox/helpers/publisher.rb

@@ -1,15 +1,14 @@
 module Istox
   class Publisher
     class << self
-
       def initialize!(amqp_config_path)
         @@amqp_config_path = amqp_config_path
       end
 
       def publish(exchange, routing_key, message)
-        Rails.logger.info 'Before publish retrieve data..'
+        Rails.logger.debug 'Before publish retrieve data..'
         durable = data.fetch('publish')[exchange]['durable']
-        Rails.logger.info "Publishing message: #{message} with exchange: #{exchange} routing key: #{routing_key}"
+        Rails.logger.debug "Publishing message: #{message} with exchange: #{exchange} routing key: #{routing_key}"
         enqueue do
           $channel
             .direct(exchange, durable: durable)
@@ -18,7 +17,7 @@ module Istox
       end
 
       def publish_to_fanout(exchange, message)
-        Rails.logger.info 'Before publish retrieve data..'
+        Rails.logger.debug 'Before publish retrieve data..'
         durable = data.fetch('publish')[exchange]['durable']
         enqueue do
           $channel

data/lib/istox/helpers/vault.rb

@@ -4,7 +4,6 @@ module Istox
   module Vault
     module TOTP
       class << self
-
         def create(sid, host)
           Rails.logger.debug { "Generate vault TOTP for key #{totp_key(sid).inspect}" }
 
@@ -18,7 +17,7 @@ module Istox
 
         def generate_code(sid)
           Rails.logger.debug { "Generate 6-digit OTP code: key #{totp_code_key(sid)}" }
-          return read_data(totp_code_key(sid)).data[:code]
+          read_data(totp_code_key(sid)).data[:code]
         end
 
         def validate?(sid, code)
@@ -54,7 +53,6 @@ module Istox
     end
 
     class << self
-
       def logical
         ::Vault.logical
       end
@@ -80,8 +78,8 @@ module Istox
       end
 
       def validate_otp(sid, otp)
-        return ::Istox::Vault::TOTP.validate?(sid, otp)
-      rescue => e
+        ::Istox::Vault::TOTP.validate?(sid, otp)
+      rescue StandardError => e
         raise e
         false
       end

data/lib/istox/interfaces/chainhub/transaction.rb

@@ -12,9 +12,9 @@ module Istox
                 }
               }
             GRAPHQL
-      
-            ::Istox::GraphqlClient.query("chainhub", query, { hashes: txhashes }).data.block_transactions
-          end 
+
+            ::Istox::GraphqlClient.query('chainhub', query, hashes: txhashes).data.block_transactions
+          end
         end
       end
     end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.90'.freeze
+  VERSION = '0.1.91'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.90
+  version: 0.1.91
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -304,8 +304,6 @@ files:
 - lib/istox/helpers/publisher.rb
 - lib/istox/helpers/vault.rb
 - lib/istox/interfaces/chainhub/transaction.rb
-- lib/istox/logging/hash_logging.rb
-- lib/istox/logging/log_formatter.rb
 - lib/istox/models/blockchain_receipt.rb
 - lib/istox/models/concerns/blockchain_receipt_query.rb
 - lib/istox/quant/bond.rb

data/lib/istox/logging/hash_logging.rb

@@ -1,26 +0,0 @@
-module Istox
-  module Logging
-    module HashLogging
-      include ActiveSupport::TaggedLogging
-
-      def self.new(logger)
-        logger.formatter ||= ActiveSupport::Logger::SimpleFormatter.new
-        logger.formatter.extend Formatter
-        logger.extend(self)
-      end
-
-      module Formatter
-        include ActiveSupport::TaggedLogging::Formatter
-
-        def call(severity, timestamp, progname, msg)
-          tagged_message = if msg.is_a?(Hash) then tags_text.present? ? msg.merge(tags: tags_text) : msg
-                           elsif tags_text.present? then { message: msg, tag: tags_text }
-                           else msg
-                           end
-
-          self.class.instance_method(:call).bind(self).call(severity, timestamp, progname, tagged_message)
-        end
-      end
-    end
-  end
-end

data/lib/istox/logging/log_formatter.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Istox
-  module Logging
-    class LogFormatter
-      def call(severity, _time, progname, msg = '')
-        return '' if msg.blank?
-
-        hash = {
-          level: severity,
-          message: processed_message(msg)
-        }
-
-        hash[:app] = progname if progname.present?
-
-        hash.to_json + "\n"
-
-        # return "timestamp='#{time}' level=#{severity} progname='#{progname}' #{processed_message(msg)}\n" if progname.present?
-        # "timestamp='#{time}' level=#{severity} #{processed_message(msg)}\n"
-      end
-
-      private
-
-      def processed_message(msg)
-        return msg.map { |k, v| "#{k}='#{v&.strip}'" }.join(' ') if msg.is_a?(Hash)
-
-        msg
-      end
-    end
-  end
-end