istox 0.1.149.pre.1 → 0.1.150.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.148)
+    istox (0.1.150.1)
       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.3)
       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.8)
     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)

data/lib/istox.rb

@@ -33,6 +33,7 @@ module Istox
   require 'istox/helpers/regex_helper'
   require 'istox/helpers/result_handler'
   require 'istox/helpers/redis'
+  require 'istox/helpers/dlm'
   require 'istox/helpers/remote_model_cache'
   require 'istox/models/blockchain_receipt'
   require 'istox/models/concerns/blockchain_receipt_query'

data/lib/istox/helpers/bunny_boot.rb

@@ -252,7 +252,6 @@ module Istox
       end
 
       def queue_ok?(conn, name)
-        Logger "queue_ok? #{name}"
         ch = conn.create_channel
         begin
           q = ch.queue(name, passive: true)

data/lib/istox/helpers/dlm.rb

@@ -1,10 +1,6 @@
-require 'redlock'
-
 module Istox
   class DLMBoot
     class << self
-      private
-
       def lock(key, timeout = 3600, db)
         loop do
           break if ::Istox::RedisBoot.sets(key, 1, {nx: true, px: timeout}, db)

data/lib/istox/helpers/publisher.rb

@@ -54,6 +54,40 @@ module Istox
           end
 
           @connection = ::Istox::BunnyBoot.connection
+
+          # Start a thread to sweep @channel
+          Thread.new do
+            loop do
+              Thread.new do
+                sleep 60 * 5
+
+                tid = []
+                Thread.list.each do |t|
+                  tid << t.object_id
+                end
+                # log.info("Current tid is #{tid}")
+
+                tid_c = @channel.keys
+                # log.info("@channel tid is #{tid_c}")
+
+                tid_c.each do |t|
+                  unless tid.include? t
+                    # Close channel and remove it from @channel
+                    log.debug("Thread #{t} doesn't exist any more, close channel for it and remove it from @channel")
+                    @channel[t]['confirm-0'].close
+                    @channel[t]['confirm-1'].close
+                    @channel[t]['noconfirm'].close
+                    @channel.delete t
+
+                    # Remove exchange from @exchange
+                    @exchanges.delete t
+                  end
+                end
+              end.join
+            end
+          end
+
+          @connection
         end
       end
 
@@ -77,39 +111,6 @@ module Istox
         @channel[Thread.current.object_id]['confirm-1'] = ::Istox::BunnyBoot.channel(connection, confirm: true)
         @channel[Thread.current.object_id]['noconfirm'] = ::Istox::BunnyBoot.channel(connection, confirm: false)
 
-        threadId = Thread.current.object_id
-        # 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
-                ::Istox::BunnyBoot.del_tracker_on_channel @channel[threadId]['confirm-1'].id
-              else
-                @channel[threadId]['confirm-1'].nacked_set.each do |n|
-                  log.debug("Publish Error[Async #{threadId}]: UNACK delivery tag is #{n}, republish message")
-                  eid = ::Istox::BunnyBoot.find_tracker_on_channel @channel[threadId]['confirm-1'].id, n, 'eid'
-                  payload = ::Istox::BunnyBoot.find_tracker_on_channel @channel[threadId]['confirm-1'].id, n, 'payload'
-                  payload = JSON.parse(payload, :symbolize_names => true) unless payload.nil?
-                  options = ::Istox::BunnyBoot.find_tracker_on_channel @channel[threadId]['confirm-1'].id, n, 'options'
-                  options = JSON.parse(options, :symbolize_names => true) unless options.nil?
-                  if options.nil?
-                    routing_key = nil
-                  else
-                    routing_key = options.delete :routing_key
-                    options[:delivery_tag] = n
-                  end
-                  publish(exchange: eid, routing_key: routing_key, message: payload, options: options)
-                end
-              end
-            rescue => e
-              # log.debug "wait_for_confirm error happening: #{e}"
-            end
-          end
-        end
-
         @channel[Thread.current.object_id]
       end
 
@@ -132,7 +133,8 @@ module Istox
 
       def channel_from_mode(mode)
         if mode == 0 || mode == 1
-          channel["confirm-#{mode.to_s}"]
+          # Currently we use mode 0 only
+          channel["confirm-0"]
         else
           channel['noconfirm']
         end
@@ -234,7 +236,16 @@ module Istox
         sleep 1
         do_publish(ex,options,message)
       rescue => e
-        log.debug "Error happens: #{e}"
+        log.debug "Error happens: #{e.message}"
+
+        # If the error indicates that the channel is already closed
+        # then clear hash @channel and @exchange
+        if e.message.include? "cannot use a closed channel"
+          @channel.delete Thread.current.object_id
+          @exchanges.delete Thread.current.object_id
+          ex = exchange(eid)
+          do_publish(ex, options, message)
+        end
       end
     end
   end

data/lib/istox/helpers/remote_model_cache.rb

@@ -48,7 +48,7 @@ module Istox
         end
       end
 
-      def get(key:, field:, auto_convert_openstruct: true)
+      def get(key:, field:)
         raise 'You must provide a callback block if cache doesnt exist' unless block_given?
 
         key = key.to_s
@@ -60,7 +60,7 @@ module Istox
 
         if result.present?
           begin
-            return auto_convert_openstruct ? ::Istox::CommonHelper.to_open_struct(JSON.parse(result)) : result
+            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)

data/lib/istox/helpers/subscriber.rb

@@ -104,7 +104,7 @@ module Istox
           break unless ::Istox::BunnyBoot.queue_single_consumer? consumer_key
 
           flag = false
-          ::Istox::DLMBoot.lock("peatio:#{consumer_key}:locking", 5) do
+          ::Istox::DLMBoot.lock("peatio:#{consumer_key}:locking", 10) do
             flag = ::Istox::BunnyBoot.queue_ok? @conn, queue.name
           end
           break if flag

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.149-1'.freeze
+  VERSION = '0.1.150.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.149.pre.1
+  version: 0.1.150.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-08 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -471,11 +471,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: istox backend shared gem