fleck 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d362b6a20a242296ef0697d57c31503067df64d05b3cee439f58449a7dbe732
-  data.tar.gz: 76f4a6b22cdfdff8a9826702073eae8866751e4c5446c1d7fdd1aaecd6341655
+  metadata.gz: 12549351b1fbd3d7cc3aac011b2949ed7c75d45cc00627ebce98ba87e5ffc3fd
+  data.tar.gz: d1c254ae75c7510c6d0436a4b10610e0002478d4405c5a80034583f5b04a8b4f
 SHA512:
-  metadata.gz: 794a481e65666fa6ac3be6bd7014d0a20a54819849f2be83402950778de70d24728d3bd283a1fb71332504acb501fe7323e315dbcf9f20f4fe8c229e74120611
-  data.tar.gz: 42c5b8f0dd478e595d47bde2250a5d01d4b81414ad9670288a1098bb6f7168b71949a8401e848b3f6d2e4d163d23babb70259695ccaa7314fad962b9084a0b1f
+  metadata.gz: 3b94e6339c1aa8151c94d473eac81c918d67e2da6c805d20725a62f044bccc41c6456dd34c3e0fa16c6559c66d208196f9ae7423ed527ad891f953edccd1f6cf
+  data.tar.gz: 531c4ef36f289ab36dc796f24ec26a81de57bab049a9d4349372226416bcdb45b5e856d85ac528abbdf1e422351d1bbcddee24359065d61e72379fbf2975a122

data/lib/fleck/client.rb

@@ -3,7 +3,21 @@ module Fleck
   class Client
     include Fleck::Loggable
 
-    attr_reader :local_ip, :remote_ip
+    @instances = ThreadSafe::Array.new
+
+    def self.<<(new_instance)
+      @instances << new_instance
+    end
+
+    def self.remove_instance(instance)
+      @instances.delete(instance)
+    end
+
+    def self.terminate_all
+      @instances.map(&:terminate)
+    end
+
+    attr_reader :local_ip, :remote_ip, :terminated
 
     def initialize(connection, queue_name = "", exchange_type: :direct, exchange_name: "", multiple_responses: false, concurrency: 1)
       @connection         = connection
@@ -29,9 +43,11 @@ module Fleck
 
       logger.debug("Client initialized!")
 
-      at_exit do
-        terminate
-      end
+      Fleck::Client << self
+
+      # at_exit do
+      #   terminate
+      # end
     end
 
     def request(action: nil, version: nil, headers: {}, params: {}, async: @multiple_responses || false, timeout: @default_timeout, queue: @queue_name, rmq_options: {}, &block)
@@ -73,7 +89,8 @@ module Fleck
     def terminate
       @terminated = true
       logger.info "Unsubscribing from #{@reply_queue.name}"
-      @subscriptions.map(&:cancel) # stop receiving new messages
+      # @subscriptions.map(&:cancel) # stop receiving new messages
+      @channel&.close unless @channel&.closed?
       logger.info "Canceling pending requests"
       # cancel pending requests
       while item = @requests.shift do
@@ -83,6 +100,8 @@ module Fleck
           logger.error e.inspect + "\n" + e.backtrace.join("\n")
         end
       end
+
+      Fleck::Client.remove_instance(self)
     end
 
 
@@ -120,5 +139,9 @@ module Fleck
   end
 end
 
-require "fleck/client/request"
-require "fleck/client/response"
+at_exit do
+  Fleck::Client.terminate_all
+end
+
+require 'fleck/client/request'
+require 'fleck/client/response'

data/lib/fleck/version.rb

@@ -2,5 +2,5 @@
 
 # Open `Fleck` module to set `VERSION` constant.
 module Fleck
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Groza Sergiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler