freddy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21020f1717f322384deb6ab9ce33231c59a7d82
-  data.tar.gz: 6efdccf186349f3f874dee8889bda4a4a269b40b
+  metadata.gz: cca77c9b3fbbe1d36a577b1f83dac5403d622951
+  data.tar.gz: 173f636703aa687c57ab451739736aa55e082021
 SHA512:
-  metadata.gz: b69c2cb81573afc359da3aaa8e1387d479224716e3e49d75ea09781e85895d89891f91617873cd8a2c01dafdaaa958d4241b62d2fc50655e8f104933efb33f92
-  data.tar.gz: 813043fcd1e6d2adfdd16c5c379f9d8ba7b9df8d82db1365547760f8a827dfac4e970bbd850918e85cc401c4daf43f873f1fbb7a4a8974e5dae05ae8841ba16e
+  metadata.gz: 6eb122206afd0ed15c142b8b70a63f68501033be27e54cc4c459f7f028daf03bf9b697efd46bea521348ce38e04c5f59b936d0e0174cda572499b26456e0116c
+  data.tar.gz: 388f18d7af6a373c9952a4a36b2e4a32ccefa78ff160511993da9b18f6b4b06a527036ab648f63230d06bdf36ee644be5b2a4bf6fb0f9444bcc6f7595acc56ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    freddy (0.3.0)
+    freddy (0.3.2)
       bunny (= 1.6.3)
       hamster (~> 1.0.1.pre.rc3)
       symbolizer

data/freddy.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "freddy"
-  spec.version       = '0.3.1'
+  spec.version       = '0.3.2'
   spec.authors       = ["Urmas Talimaa"]
   spec.email         = ["urmas.talimaa@gmail.com"]
   spec.description   = %q{Messaging API}

data/lib/freddy/request.rb

@@ -3,6 +3,7 @@ require_relative 'consumer'
 require_relative 'request_manager'
 require_relative 'sync_response_container'
 require_relative 'message_handlers'
+require 'thread'
 require 'securerandom'
 require 'hamster/mutable_hash'
 
@@ -19,7 +20,6 @@ class Freddy
     def initialize(channel, logger)
       @channel, @logger = channel, logger
       @producer, @consumer = Producer.new(channel, logger), Consumer.new(channel, logger)
-      @listening_for_responses = false
       @request_map = Hamster.mutable_hash
       @request_manager = RequestManager.new @request_map, @logger
 
@@ -28,6 +28,9 @@ class Freddy
           @request_manager.no_route(properties[:correlation_id])
         end
       end
+
+      @listening_for_responses_lock = Mutex.new
+      @response_queue_lock = Mutex.new
     end
 
     def sync_request(destination, payload, opts)
@@ -43,7 +46,7 @@ class Freddy
       options.delete(:timeout)
       options.delete(:delete_on_timeout)
 
-      listen_for_responses unless @listening_for_responses
+      ensure_listening_to_responses
 
       correlation_id = SecureRandom.uuid
       @request_map.store(correlation_id, callback: block, destination: destination, timeout: Time.now + timeout)
@@ -62,7 +65,8 @@ class Freddy
 
     def respond_to(destination, &block)
       raise EmptyResponder unless block
-      @response_queue = create_response_queue unless @response_queue
+
+      ensure_response_queue_exists
       @logger.debug "Listening for requests on #{destination}"
 
       responder_handler = @consumer.consume destination do |payload, delivery|
@@ -98,14 +102,25 @@ class Freddy
       Freddy.notify_exception(e, destination: request[:destination], correlation_id: correlation_id)
     end
 
-    def listen_for_responses
-      @listening_for_responses = true
-      @response_queue = create_response_queue unless @response_queue
-      @request_manager.start
-      @consumer.consume_from_queue @response_queue do |payload, delivery|
-        handle_response payload, delivery
+    def ensure_response_queue_exists
+      @response_queue_lock.synchronize do
+        @response_queue ||= create_response_queue
       end
     end
 
+    def ensure_listening_to_responses
+      @listening_for_responses_lock.synchronize do
+        if @listening_for_responses
+          true
+        else
+          ensure_response_queue_exists
+          @request_manager.start
+          @consumer.consume_from_queue @response_queue do |payload, delivery|
+            handle_response payload, delivery
+          end
+          @listening_for_responses = true
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freddy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Urmas Talimaa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: API for inter-application messaging supporting acknowledgements and request-response