freddy 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c1ea2e30dfb3705596a40af65a95c4d722ad41
-  data.tar.gz: 60c14e4980b8e72cf131cb6161ebf8a6b632157a
+  metadata.gz: a2496631f882b6eb9b44c6249eea9426415a6af2
+  data.tar.gz: 9eed09d9bce769a4fe87799b9517c26f0a606d0e
 SHA512:
-  metadata.gz: 68b0c2b6aa8b41ec71ead2d99e01be93e5e686aec774a6c99313e0d227196b0d56336ef255858c41916f35b72cdb946ff945723c02a270df898c13ad8f9a1ee4
-  data.tar.gz: 3f4a430ef425723992644418e3a526cf51bc6cca1abe7ef3043f0d9569d84953c20240541a384ddfba92ee93596e2d9ad06b7e1a9458fe26a7095b18ecfbdc47
+  metadata.gz: 18e9eedeb5afdd6fbd2ae9256871e11e04b2850a086648c7584a3478e570c2720bdd39c9b24441c026994b2cf0f7708bb010c115690ba8422e0db70c9859d2a9
+  data.tar.gz: 2578e475defeb9b2ca3fe194f9bdf0881ebc0b7c10c74f3cce216f2b92d5cddef428ec12617db9308dc472894dbeb804ef798a38c05a5ceeec5503a6955b2f6d

data/freddy.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   else
     spec.name          = "freddy"
   end
-  spec.version       = '0.5.2'
+  spec.version       = '0.5.3'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy/producers/send_and_wait_response_producer.rb

@@ -17,7 +17,6 @@ class Freddy
         end
 
         @response_queue = @channel.queue("", exclusive: true)
-        @request_manager.start
 
         @response_consumer = Consumers::ResponseConsumer.new(@logger)
         @response_consumer.consume(@response_queue, &method(:handle_response))
@@ -26,20 +25,30 @@ class Freddy
       def produce(destination, payload, properties)
         timeout_in_seconds = properties.fetch(:timeout_in_seconds)
         container = SyncResponseContainer.new
-        async_request destination, payload, properties, &container
-        container.wait_for_response(timeout_in_seconds + 0.1)
+        async_request destination, payload, container, properties
+        container.wait_for_response(timeout_in_seconds)
       end
 
       private
 
-      def async_request(destination, payload, timeout_in_seconds:, delete_on_timeout:, **properties, &block)
+      def async_request(destination, payload, container, timeout_in_seconds:, delete_on_timeout:, **properties)
         correlation_id = SecureRandom.uuid
+
         @request_manager.store(correlation_id,
-          callback: block,
-          destination: destination,
-          expires_at: Time.now + timeout_in_seconds
+          callback: container,
+          destination: destination
         )
 
+        container.on_timeout do
+          @logger.warn "Request timed out waiting response from #{destination}, correlation id #{correlation_id}"
+          Utils.notify 'RequestTimeout', "Request timed out waiting for response from #{destination}", {
+            correlation_id: correlation_id,
+            destination: destination,
+            timeout_in_seconds: timeout_in_seconds
+          }
+          @request_manager.delete(correlation_id)
+        end
+
         if delete_on_timeout
           properties[:expiration] = (timeout_in_seconds * 1000).to_i
         end

data/lib/freddy/request_manager.rb

@@ -1,20 +1,10 @@
 class Freddy
   class RequestManager
-
     def initialize(logger)
       @requests = Hamster.mutable_hash
       @logger = logger
     end
 
-    def start
-      @timeout_thread = Thread.new do
-        while true do
-          clear_timeouts Time.now
-          sleep 0.05
-        end
-      end
-    end
-
     def no_route(correlation_id)
       if request = @requests[correlation_id]
         @requests.delete correlation_id
@@ -29,26 +19,5 @@ class Freddy
     def delete(correlation_id)
       @requests.delete(correlation_id)
     end
-
-    private
-
-    def clear_timeouts(now)
-      @requests.each do |key, value|
-        timeout(key, value) if now > value[:expires_at]
-      end
-    end
-
-    def timeout(correlation_id, request)
-      @requests.delete correlation_id
-
-      @logger.warn "Request timed out waiting response from #{request[:destination]}, correlation id #{correlation_id}"
-      Utils.notify 'RequestTimeout', "Request timed out waiting for response from #{request[:destination]}", {
-        correlation_id: correlation_id,
-        destination: request[:destination],
-        expires_at: request[:expires_at]
-      }
-
-      request[:callback].call({error: 'RequestTimeout', message: 'Timed out waiting for response'}, nil)
-    end
   end
 end

data/lib/freddy/sync_response_container.rb

@@ -13,6 +13,10 @@ class Freddy
       @mutex.synchronize { @waiting.wakeup }
     end
 
+    def on_timeout(&block)
+      @on_timeout = block
+    end
+
     def wait_for_response(timeout)
       @mutex.synchronize do
         @waiting = Thread.current
@@ -20,22 +24,18 @@ class Freddy
       end
 
       if !defined?(@response)
-        raise Timeout::Error, 'execution expired'
+        @on_timeout.call
+        raise TimeoutError.new(
+          error: 'RequestTimeout',
+          message: 'Timed out waiting for response'
+        )
       elsif @response.nil?
         raise StandardError, 'unexpected nil value for response'
-      elsif @response[:error] == 'RequestTimeout'
-        raise TimeoutError.new(@response)
       elsif !@delivery || @delivery.type == 'error'
         raise InvalidRequestError.new(@response)
       else
         @response
       end
     end
-
-    private
-
-    def to_proc
-      Proc.new {|*args| self.call(*args)}
-    end
   end
 end

data/spec/freddy/sync_response_container_spec.rb

@@ -3,11 +3,21 @@ require 'spec_helper'
 describe Freddy::SyncResponseContainer do
   let(:container) { described_class.new }
 
+  before do
+    container.on_timeout {}
+  end
+
   context 'when timeout' do
     subject { container.wait_for_response(0.01) }
 
     it 'raises timeout error' do
-      expect { subject }.to raise_error(Timeout::Error, 'execution expired')
+      expect { subject }.to raise_error do |error|
+        expect(error).to be_a(Freddy::TimeoutError)
+        expect(error.response).to eq(
+          error: 'RequestTimeout',
+          message: 'Timed out waiting for response'
+        )
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler