ElmerFudd 0.0.22 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1b4a8df99cde4543eab1c5bc3e49bdb5fe64b1
-  data.tar.gz: aca2e2f7a8f945024f0e70758a68b6a25c0ef414
+  metadata.gz: 495ca1024544a93568872748bc264f6654ba8dda
+  data.tar.gz: 4280d48353cb7746adf1858f7a4b274c9d765987
 SHA512:
-  metadata.gz: 6ea1a8c610dbb0fcfa2e2580837a6c900e9544c71d965ff8a9cd30dd956b5d21f566316bccd34d854ecae80b12129158746485fca4b4abb9b7245b203ad63c27
-  data.tar.gz: 92cd593f028b61e16ed921821b8b3917eabd797f00fe7be75b275d5639b76df3e353085aae441e873c63d6172bc38184d0bd1943f5457f9e6802d0cc836a07ba
+  metadata.gz: cc27f1148cc89102d73fb67c8fc4ad0bb3c5d9924d5e77eb66ae87acb34cc6817384ec9a1ba7be86dcd14cae5569f5889915625f2b5613640166301637dca760
+  data.tar.gz: 192f28497fa7a70ce86dc2746df757144e0e22ae0721a5415d793d57143f31c3bed2d6aaf767dfa315bd7da0be23181d2fd9c397260970504d7db8862eba5a7c

data/lib/ElmerFudd/version.rb

@@ -1,3 +1,3 @@
 module ElmerFudd
-  VERSION = "0.0.22"
+  VERSION = "0.0.24"
 end

data/lib/ElmerFudd.rb

@@ -1,5 +1,6 @@
 require "ElmerFudd/version"
 require "bunny"
+require "thread"
 
 module ElmerFudd
   class Publisher
@@ -21,22 +22,28 @@ module ElmerFudd
     end
 
     def call(queue_name, payload, timeout: 10)
-      x.publish(payload.to_s, routing_key: queue_name, reply_to: rpc_reply_queue.name,
-                correlation_id: correlation_id = @uuid_service.call)
-      response = nil
+      mutex = Mutex.new
+      resource = ConditionVariable.new
+      correlation_id = @uuid_service.call
       consumer_tag = @uuid_service.call
+      response = nil
+
       Timeout.timeout(timeout) do
-        rpc_reply_queue.subscribe(manual_ack: false, block: true, consumer_tag: consumer_tag) do |delivery_info, properties, payload|
+        rpc_reply_queue.subscribe(manual_ack: false, block: false, consumer_tag: consumer_tag) do |delivery_info, properties, payload|
           if properties[:correlation_id] == correlation_id
             response = payload
-            delivery_info.consumer.cancel
+            mutex.synchronize { resource.signal }
           end
         end
+
+        x.publish(payload.to_s, routing_key: queue_name, reply_to: rpc_reply_queue.name,
+                  correlation_id: correlation_id)
+
+        mutex.synchronize { resource.wait(mutex) unless response }
+        response
       end
-      response
-    rescue Timeout::Error
+    ensure
       reply_channel.consumers[consumer_tag].cancel
-      raise
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ElmerFudd
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.24
 platform: ruby
 authors:
 - Andrzej Sliwa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny