istox 0.1.150 → 0.1.150.1

data/.idea/workspace.xml

@@ -4,10 +4,10 @@
     <list default="true" id="f70e0449-76c0-44d8-bcb9-7991f2a7e0f8" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/istox-gem.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/istox-gem.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/istox.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/istox.rb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/istox/helpers/bunny_boot.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/istox/helpers/bunny_boot.rb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/istox/helpers/dlm.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/istox/helpers/dlm.rb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/istox/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/istox/version.rb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/istox/helpers/publisher.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/istox/helpers/publisher.rb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spec/helpers/istox/publisher_spec.rb" beforeDir="false" afterPath="$PROJECT_DIR$/spec/helpers/istox/publisher_spec.rb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spec/spec_helper.rb" beforeDir="false" afterPath="$PROJECT_DIR$/spec/spec_helper.rb" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,7 +43,11 @@
       <updated>1566200631090</updated>
       <workItem from="1566200632743" duration="997000" />
       <workItem from="1588041821198" duration="7000" />
-      <workItem from="1588041848702" duration="662000" />
+      <workItem from="1588041848702" duration="4629000" />
+      <workItem from="1588230991821" duration="301000" />
+      <workItem from="1588595833261" duration="1768000" />
+      <workItem from="1589424486664" duration="887000" />
+      <workItem from="1589685965376" duration="22817000" />
     </task>
     <servers />
   </component>

data/Gemfile.lock

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

data/lib/istox/helpers/publisher.rb

@@ -54,6 +54,37 @@ 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
+                  end
+                end
+              end.join
+            end
+          end
+
+          @connection
         end
       end
 
@@ -77,39 +108,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 +130,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

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.150'.freeze
+  VERSION = '0.1.150.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.150
+  version: 0.1.150.1
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print