istox 0.1.152.debug.1 → 0.1.152.debug.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8e7a6d17bfa0e11c8f4092e5b28a97fab649014e89e8803db77b72743c92f8
-  data.tar.gz: 5c06393f08a07ae68427a523f4d2d308c710ecdd03f502b8d1d0734542a53416
+  metadata.gz: 943a1686f6d726dbfaeb2af88c06c53673e74a6a77c6004dd5d1fc1045615876
+  data.tar.gz: 29185dfe629ff4d5d23d62a7725f30a28382ce83668ceee1af94d1698a12ba42
 SHA512:
-  metadata.gz: 9b4dfb8e5d2569537c218619ac2883e07efd6370bc919af1a29bb1751ddf790a04ff3b39e26f7910b1b82aa0aeac55f638f107a162723ca730f947ab05e8d159
-  data.tar.gz: f99d75d0ab683ec32a36b3f25008fb827c1b2d9da125c81234b7bd36bf9dba8df4f65839e6f3266338c1235f050f5a4d061cbebaabeabe1cc4a6543fcf2cff52
+  metadata.gz: c85434bf9328afd1cefcc9cc709671e1b854dd171a72851337bf5a9a640c63c835c7edaf0e5f14baf95dfe782dca848356c6c174bb871954f349ec0a26d2e623
+  data.tar.gz: ab7c29c49cd76e1499408dc08fb36e72e4cef65fcf1bcf8b971af7601f4957a5ba8a1faa614eab6af0c6278982eb49970e1372fa7dbfa1bc78abd3a695149222

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.151)
+    istox (0.1.152.debug.1)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)

data/lib/istox/helpers/publisher.rb

@@ -54,6 +54,39 @@ module Istox
           end
 
           @connection = ::Istox::BunnyBoot.connection
+
+          # Start a thread to sweep @channel
+          Thread.new do
+            loop do
+              Thread.new do
+                # sleep 60 * 5
+                sleep 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.info("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
+                  end
+                end
+              end.join
+            end
+          end
+
+          @connection
         end
       end
 
@@ -70,7 +103,6 @@ module Istox
       def channel
         return @channel[Thread.current.object_id] if @channel.present? && @channel[Thread.current.object_id].present?
 
-        log.info "Current @channel object is: #{@channel}"
         log.info "#{Thread.current.object_id} No channel yet, create 2 channels confirm-mode and non-confirm-mode ... ..."
         @channel = Hash.new if @channel.nil?
         @channel[Thread.current.object_id] = Hash.new
@@ -78,12 +110,14 @@ 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)
 
+        log.info "Current @channel object is: #{@channel}"
+
         threadId = Thread.current.object_id
         # Start new thread on receiving ACK from 'confirm-1' channel on the specified thread
         Thread.new do
+          log.info("Create thread #{Thread.current.object_id} for monitoring confirm-1")
           loop do
             sleep 5
-            log.info("Create thread #{Thread.current.object_id} for monitoring confirm-1")
             begin
               success = @channel[threadId]['confirm-1'].wait_for_confirms
               if success
@@ -102,7 +136,6 @@ module Istox
                     routing_key = options.delete :routing_key
                     options[:delivery_tag] = n
                   end
-
                   publish(exchange: eid, routing_key: routing_key, message: payload, options: options)
                 end
               end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.152.debug.1'.freeze
+  VERSION = '0.1.152.debug.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.152.debug.1
+  version: 0.1.152.debug.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print