tdl-client-ruby 0.19.2 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99214da19f3a78b06525a6e190e572f5eb80f7f5
-  data.tar.gz: fb6aeae12794813869d77f463982f36503625d27
+  metadata.gz: bfea2b9c8522c632c1575cb265fa63878c43bc58
+  data.tar.gz: dadbb03629370a64ba8a4a4276f89e02226989ba
 SHA512:
-  metadata.gz: 60c572d16cbadaf8e6a06ab0874e03a2c8b076182d5126a3e3fa0758105befecb101d9f44f1090def6bd1a4eca91ebd7441bd3f8f399b3a1f495292b14372627
-  data.tar.gz: bdb85f0924d671be7289474b082eccd4ca8473564621f4979b3eb288726dd31a321a14331c82a57a99919f9953601d688bda3f850c61068fbf36e39987f43319
+  metadata.gz: aeb4e17b7745cacf524813ffb60764420371da73130b379571bc21e4883392694a3bd9a00494207e9323aadde3b2775c9a8bc54faa281d1a7dea61b9b19ed609
+  data.tar.gz: aa0d593c0048d922993c6296ca1c7c306a8d3eb3bf827ca0c4201414cb290913e26c389501bbd64093e945166368ff973f1701840adb97c83ce653cec0a9ddd0

data/lib/tdl/client.rb

@@ -33,7 +33,6 @@ module TDL
         @logger.info 'Waiting for requests.'
         remote_broker.join
         @logger.info 'Stopping client.'
-        remote_broker.close unless remote_broker.closed?
 
       rescue Exception => e
         # raise e if ENV['TDL_ENV'] == 'test'

data/lib/tdl/previous_version.rb

@@ -1,4 +1,4 @@
 module TDL
-  PREVIOUS_VERSION = '0.19.1'
+  PREVIOUS_VERSION = '0.19.2'
   # the current MAJOR.MINOR version is dynamically computed from the version of the Spec
 end

data/lib/tdl/thread_timer.rb

@@ -6,15 +6,15 @@ class ThreadTimer
     @timer_thread = nil
   end
 
-  def start_timer
+  def start
     @continue = true
     @timer_thread = Thread.new { start_timeout }
   end
 
-  def stop_timer
-    @continue = false
+  def stop
     @timer_thread.terminate unless @timer_thread.nil?
     @timer_thread = nil
+    @continue = false
   end
 
   private

data/lib/tdl/transport/remote_broker.rb

@@ -5,31 +5,34 @@ module TDL
     def initialize(hostname, port, unique_id, request_timeout_millis)
       @stomp_client = Stomp::Client.new('', '', hostname, port)
       @unique_id = unique_id
+      @request_queue = "/queue/#{@unique_id}.req"
+      @response_queue = "/queue/#{@unique_id}.resp"
       @serialization_provider = JSONRPCSerializationProvider.new
-      @timer_thread = ThreadTimer.new(request_timeout_millis, lambda = ->() { close })
+      @timer = ThreadTimer.new(request_timeout_millis, lambda = ->() { close unless closed? })
+      @timer.start
     end
 
     def subscribe(handling_strategy)
-      @stomp_client.subscribe("/queue/#{@unique_id}.req", {:ack => 'client-individual', 'activemq.prefetchSize' => 1}) do |msg|
-        @timer_thread.stop_timer
+      @stomp_client.subscribe(@request_queue, {:ack => 'client-individual', 'activemq.prefetchSize' => 1}) do |msg|
+        @timer.stop
         request = @serialization_provider.deserialize(msg)
         handling_strategy.process_next_request_from(self, request)
-        @timer_thread.start_timer
+        @timer.start
       end
     end
 
     def respond_to(request, response)
       serialized_response = @serialization_provider.serialize(response)
-      @stomp_client.publish("/queue/#{@unique_id}.resp", serialized_response)
+      @stomp_client.publish(@response_queue, serialized_response)
       @stomp_client.acknowledge(request.original_message)
     end
 
     def join
-      @timer_thread.start_timer
       @stomp_client.join
     end
 
     def close
+      @stomp_client.unsubscribe(@request_queue)
       @stomp_client.close
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdl-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.3
 platform: ruby
 authors:
 - Julian Ghionoiu
@@ -221,7 +221,7 @@ homepage: https://github.com/julianghionoiu/tdl-client-ruby
 licenses:
 - GPL-3.0
 metadata:
-  previous_version: 0.19.1
+  previous_version: 0.19.2
 post_install_message: 
 rdoc_options: []
 require_paths: