istox 0.1.146 → 0.1.147

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4accfc13d0656d9504ac06c29fe50e7f9f5d9cb97dc703939805f5ed71d7a0a5
-  data.tar.gz: a7ff200588097591dd9bac3f2e038f2c4aac4724c12191d2163a00e34e511d44
+  metadata.gz: 62410937adc037a38505293af9ea88f757b4a41cf3f5b79a1e3fa6965cfb0da6
+  data.tar.gz: 3e10782579a06c8eae536aef7cc035cf99a7c771f3544b1652deee5e3e69383a
 SHA512:
-  metadata.gz: e73247e688595f536682164ce68fdaff0091894f10b2de32a284c385a8dc42d6af5e090b796c0beb92d981ff6f0177748185b74aac7a7d6f4cb07889e3fb55a2
-  data.tar.gz: 2117eb0a8e85d4b31ec70277881229ec2f426d0f4aa51dbde8ca41e3e2557c7d219ce9aa60095e1cfded3c54d1045859c8ec09510cd9612764ba1a9561d6cb29
+  metadata.gz: 02a49ce44bbf0ebaddfd6a1bdd69a6c6e23339c78aa104550c1bf373db07db1695b7d8055fd34da46f56a50b79ca42cb25970d1a1f2ef4c2dc1af2df86adafa5
+  data.tar.gz: 012173f47716a26701cbb4ab6ffa792e3a2f02bdbe9d1afaf572cdd63bd552a5f61a21fe3e3c64154f5a953de5714bca131c5f5dbd9be8998c54c8576d65ccfe

data/.idea/.rakeTasks

@@ -4,4 +4,4 @@ You are allowed to:
 1. Remove rake task
 2. Add existing rake tasks
 To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build istox-0.1.130.pre.3.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install istox-0.1.130.pre.3.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install istox-0.1.130.pre.3.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.130.pre.3 and build and push istox-0.1.130.pre.3.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/istox-gem.iml

@@ -4,9 +4,32 @@
     <shared />
   </component>
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/vendor" />
+    </content>
+    <orderEntry type="jdk" jdkName="RVM: ruby-2.5.3" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.16.6, RVM: ruby-2.5.3 [global]) [gem]" level="application" />
+    <orderEntry type="module-library">
+      <library name="tzinfo (vbundled(1.2.6)) [path][gem]" type="rubylib">
+        <properties>
+          <option name="version" value="4" />
+        </properties>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/tzinfo-1.2.6/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/tzinfo-1.2.6/test" />
+        </CLASSES>
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/tzinfo-1.2.6/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/tzinfo-1.2.6/test" />
+        </SOURCES>
+        <excluded>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/tzinfo-1.2.6/test" />
+        </excluded>
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.17.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.6, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.5.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.5.3) [gem]" level="application" />
   </component>
 </module>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.144)
+    istox (0.1.145)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -65,7 +65,7 @@ GEM
     arel (9.0.0)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-sigv4 (1.1.1)
+    aws-sigv4 (1.1.2)
       aws-eventstream (~> 1.0, >= 1.0.2)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
@@ -98,18 +98,18 @@ GEM
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.4-universal-darwin)
+    google-protobuf (3.11.4)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
     graphlient (0.3.7)
       faraday
       faraday_middleware
       graphql-client
-    graphql (1.10.6)
+    graphql (1.10.7)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.28.0-universal-darwin)
+    grpc (1.28.0)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.28.0)
@@ -148,7 +148,7 @@ GEM
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     oj (3.10.6)
-    ougai (1.8.3)
+    ougai (1.8.4)
       oj (~> 3.10)
     paranoia (2.4.2)
       activerecord (>= 4.0, < 6.1)

data/lib/istox/helpers/bunny_boot.rb

@@ -355,7 +355,14 @@ module Istox
       end
 
       def find_trackers(pattern)
-        ::Istox::RedisBoot.keys(pattern, 4)
+        cursor = 0
+        all_keys = []
+        loop {
+          cursor, keys = ::Istox::RedisBoot.scan(cursor, {:match => pattern, :count => 500}, 4)
+          all_keys += keys
+          break if cursor == "0"
+        }
+        all_keys.uniq
       end
 
       def get_tracker(key)

data/lib/istox/helpers/publisher.rb

@@ -81,6 +81,8 @@ module Istox
         # Start new thread on receiving ACK from 'confirm-1' channel on the specified thread
         Thread.new do
           loop do
+            sleep 5
+
             begin
               success = @channel[threadId]['confirm-1'].wait_for_confirms
               if success
@@ -105,8 +107,6 @@ module Istox
             rescue => e
               # log.debug "wait_for_confirm error happening: #{e}"
             end
-
-            sleep 2
           end
         end
 

data/lib/istox/helpers/redis.rb

@@ -8,8 +8,8 @@ module Istox
         redis(db).set(k,v, options)
       end
 
-      def keys(p, db)
-        redis(db).keys p
+      def scan(cursor, options = {}, db)
+        redis(db).scan cursor, options
       end
 
       def del(k, db)
@@ -43,10 +43,12 @@ module Istox
       private
 
       def redis(db)
-        @redis ||= Redis.new(
+        @redis = {} if @redis.nil?
+        @redis[db] = Redis.new(
             url: ENV["REDIS_URL"] || 'redis://127.0.0.1',
             db: db
-        )
+        ) if @redis[db].nil?
+        @redis[db]
       end
     end
   end

data/lib/istox/helpers/remote_model_cache.rb

@@ -5,8 +5,6 @@ module Istox
     class << self
       #### keys must be an array
       def cache(data:, key:, fields: nil, field: nil)
-        return unless enable?
-
         fields = [] if fields.blank?
         fields.push(field) if field.present?
 
@@ -32,8 +30,6 @@ module Istox
       end
 
       def remove(key:, fields: nil, field: nil)
-        return unless enable?
-
         fields = [] if fields.blank?
         fields.push(field) if field.present?
 
@@ -55,26 +51,22 @@ module Istox
       def get(key:, field:)
         raise 'You must provide a callback block if cache doesnt exist' unless block_given?
 
-        if enable?
-          log.debug "Start getting data from cache, key: #{key}, field: #{field}"
-
-          key = key.to_s
-          field = field.to_s
+        key = key.to_s
+        field = field.to_s
 
-          result = redis.hget(key, field)
+        result = redis.hget(key, field)
 
-          log.debug "Getting data from cache, key: #{key}, field: #{field}, result: #{result.inspect}"
+        log.debug "Getting data from cache, key: #{key}, field: #{field}, result: #{result.inspect}"
 
-          if result.present?
-            begin
-              return ::Istox::CommonHelper.to_open_struct(JSON.parse(result))
-            rescue StandardError => e
-              log.warn('Unable to process result from cache store, is it not a json?')
-              log.warn(e)
-            end
-          else
-            log.debug 'Fallback to data retrieval block.'
+        if result.present?
+          begin
+            return ::Istox::CommonHelper.to_open_struct(JSON.parse(result))
+          rescue StandardError => e
+            log.warn('Unable to process result from cache store, is it not a json?')
+            log.warn(e)
           end
+        else
+          log.debug 'Fallback to data retrieval block.'
         end
 
         yield if block_given?
@@ -90,10 +82,6 @@ module Istox
           db: 5
         ))
       end
-
-      def enable?
-        ENV.fetch('ENABLE_REMOTE_MODEL_CACHING', true).to_s.downcase == 'true'
-      end
     end
   end
 end

data/lib/istox/helpers/subscriber.rb

@@ -158,7 +158,8 @@ module Istox
               result = @workers[ruby_class].process(processing_payload, metadata, delivery_info)
             end
           else
-            ::Istox::BunnyBoot.cacheMsg(Time.now.to_s, {queue: queue.name, payload: payload}) if store
+            # Instead of cache msg, print log
+            log.fatal "Drop msg at #{Time.now.to_s} for queue #{queue.name}, payload is #{JSON.dump(payload)}" if store
           end
           # active_channel.ack(delivery_info.delivery_tag) if manual_ack
         rescue StandardError => e

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.146'.freeze
+  VERSION = '0.1.147'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.146
+  version: 0.1.147
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem