tdl-client-ruby 0.12.1 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5762498704d319716ca2794e81a99daf5865f7d3
-  data.tar.gz: d34845d348a5306982367fb69edc077761f88d03
+  metadata.gz: 5b5e647e4e638a6cad25dbc4f3b7fdd1955fd4c3
+  data.tar.gz: 6e9f34d8413b93a72aeb50bb1246b38b3c8b6561
 SHA512:
-  metadata.gz: d9fbf0e8bffcefd374edfe90c645b7e8b170d5e5423f6af415a28958739e2e8d463087d1759b2bcd910f892aaf2910f23a395e1199f62ad551f6f399d32fc0e9
-  data.tar.gz: 8a8e0bb4f013c2e125373e8034ed8ea4ff5916f3a67f149d8927ced2061cb0923ce93c58b24652dc51a28fb7f7915f43a65741e73aad5469df1c50046306ea9e
+  metadata.gz: 6d7a0de04a79f5f8c76a228a3a26885823fba9fd37454a2fd107fdd32eca20883fb12eaf2ac3fa291cc9174f57e5a10c200bc1bd3e9e0164395eb20ab6575812
+  data.tar.gz: 3980492089526e896f596bd86c292ff1bcdff2101adf8bb527ed3aa01f664631b794876f47ed5d0c540794447d681f047e2e63d52c5cc8d873ef8ac322df47f1

data/.gitignore

@@ -3,3 +3,4 @@ pkg
 Gemfile.lock
 out
 coverage
+.DS_Store

data/lib/tdl/client.rb

@@ -11,30 +11,41 @@ module TDL
 
   class Client
 
-    def initialize(hostname:, port: 61613, unique_id:, time_to_wait_for_requests: 3)
+    def initialize(hostname:, port: 61613, unique_id:, request_timeout_millis: 500)
       @hostname = hostname
       @port = port
       @unique_id = unique_id
-      @time_to_wait_for_requests = time_to_wait_for_requests
+      @request_timeout_millis = request_timeout_millis
       @logger = Logging.logger[self]
+      @total_processing_time = nil
+    end
+
+    def get_request_timeout_millis
+      @request_timeout_millis
     end
 
     def go_live_with(processing_rules)
+      time1 = Time.now.to_f
       begin
         @logger.info 'Starting client.'
-        remote_broker = RemoteBroker.new(@hostname, @port, @unique_id)
+        remote_broker = RemoteBroker.new(@hostname, @port, @unique_id, @request_timeout_millis)
         remote_broker.subscribe(ApplyProcessingRules.new(processing_rules))
-
-        #DEBT: We should have no timeout here. We could put a special message in the queue
         @logger.info 'Waiting for requests.'
-        remote_broker.join(@time_to_wait_for_requests)
+        remote_broker.join
         @logger.info 'Stopping client.'
         remote_broker.close
+
       rescue Exception => e
         # raise e if ENV['TDL_ENV'] == 'test'
         @logger.error "There was a problem processing messages. #{e.message}"
         @logger.error e.backtrace.join("\n")
       end
+      time2 = Time.now.to_f
+      @total_processing_time = (time2 - time1) * 1000.00
+    end
+
+    def total_processing_time
+      @total_processing_time
     end
 
 
@@ -67,6 +78,8 @@ module TDL
       end
 
     end
+
+
   end
 
 

data/lib/tdl/previous_version.rb

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

data/lib/tdl/thread_timer.rb

@@ -0,0 +1,34 @@
+class ThreadTimer
+  def initialize(timeout_millis, callback)
+    @timeout_millis=timeout_millis
+    @continue = true
+    @callback = callback
+    @timer_thread = nil
+  end
+
+  def start_timer
+    @continue = true
+    @timer_thread = Thread.new { start_timeout }
+  end
+
+  def stop_timer
+    @continue = false
+    @timer_thread.terminate unless @timer_thread.nil?
+    @timer_thread = nil
+  end
+
+  private
+
+  def start_timeout
+    total_millis = 0
+    interval_millis = 10
+    while @continue && total_millis < @timeout_millis
+      sleep interval_millis / 1000.00
+      total_millis += interval_millis
+    end
+
+    if total_millis >= @timeout_millis
+      @callback.call
+    end
+  end
+end

data/lib/tdl/transport/remote_broker.rb

@@ -1,15 +1,20 @@
+require_relative '../thread_timer'
+
 module TDL
   class RemoteBroker
-    def initialize(hostname, port, unique_id)
+    def initialize(hostname, port, unique_id, request_timeout_millis)
       @stomp_client = Stomp::Client.new('', '', hostname, port)
       @unique_id = unique_id
       @serialization_provider = JSONRPCSerializationProvider.new
+      @timer_thread = ThreadTimer.new(request_timeout_millis, lambda = ->() { close })
     end
 
     def subscribe(handling_strategy)
       @stomp_client.subscribe("/queue/#{@unique_id}.req", {:ack => 'client-individual', 'activemq.prefetchSize' => 1}) do |msg|
+        @timer_thread.stop_timer
         request = @serialization_provider.deserialize(msg)
         handling_strategy.process_next_request_from(self, request)
+        @timer_thread.start_timer
       end
     end
 
@@ -19,12 +24,17 @@ module TDL
       @stomp_client.acknowledge(request.original_message)
     end
 
-    def join(limit)
-      @stomp_client.join(limit)
+    def join
+      @timer_thread.start_timer
+      @stomp_client.join
     end
 
     def close
       @stomp_client.close
     end
+
+    def closed?
+      @stomp_client.closed?
+    end
   end
 end

data/tdl-client-ruby.iml

@@ -30,7 +30,7 @@
     <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.24, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.12.2, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.2, rbenv: 2.2.2) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.2.2) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.8.6, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="little-plugger (v1.1.4, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="logging (v2.0.0, rbenv: 2.2.2) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v2.6.1, rbenv: 2.2.2) [gem]" level="application" />

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdl-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.19.1
 platform: ruby
 authors:
 - Julian Ghionoiu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stomp
@@ -189,7 +189,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".gitmodules"
 - CODE_OF_CONDUCT.md
@@ -212,6 +211,7 @@ files:
 - lib/tdl/processing_rules.rb
 - lib/tdl/serialization/deserialization_exception.rb
 - lib/tdl/serialization/json_rpc_serialization_provider.rb
+- lib/tdl/thread_timer.rb
 - lib/tdl/transport/remote_broker.rb
 - lib/tdl/util.rb
 - release.sh
@@ -221,7 +221,7 @@ homepage: https://github.com/julianghionoiu/tdl-client-ruby
 licenses:
 - GPL-3.0
 metadata:
-  previous_version: 0.11.1
+  previous_version: 0.12.1
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A client to connect to the central kata server.