liebre 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea30bec0897de16f0f5c622dfc40dd4918e10a4
-  data.tar.gz: 129b44949789081686fd1331701bca94c1a498b5
+  metadata.gz: 8735a3d7c701e1d809f2d5e37008a989d1ace4e1
+  data.tar.gz: c0ecff68630874551934f13d5eb5f64bff928543
 SHA512:
-  metadata.gz: fb2469f49b0b8583ce5b73fb20c6396b4791d395d2ad2dfc7f8d9486d8bc675a7dc2b666fe16cd5950d709bc05cf7cc1f0d9da24b6fe2eced3ef92ad71227d4d
-  data.tar.gz: ec76d7163561e469037e61b12ab3f2c35968fec5217b756119729e51981692fe7dc691a2d80f0c7e4d0ab1da6f5c5d3668936226cd315e7644ec7b087b4588ae
+  metadata.gz: f799aa599bb0ef36f6364aaa2618a4ff3818310c29c4e6a749c42280a08e982336bed3e4663fd6bd807f897c7b29feb060c54f88c2635a24a2b66b1f50e24712
+  data.tar.gz: 06d1105f5c4bd235d56ca6ff97aad3116501f50992e3c20337eb331e1a478af7ef3657b0c0a5a1d731071800372b397f65b9e814af524d98e0723bc92e37eeb1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    liebre (0.1.2)
+    liebre (0.1.3)
       bunny (~> 2.5, >= 2.5.1)
 
 GEM

data/lib/liebre/publisher.rb

@@ -7,6 +7,7 @@ module Liebre
     
     def enqueue message, options = {}
       with_connection do
+        logger.debug "Liebre: Publishing '#{message}' with '#{options}' to exchange: #{exchange}"
         exchange.publish message, options
       end
     end
@@ -14,18 +15,21 @@ module Liebre
     def enqueue_and_wait message, options = {}
       result = nil
       with_connection do
+        correlation_id = options[:correlation_id] ||= generate_uuid
+        reply_queue = reply_queue correlation_id
+        options[:reply_to] = reply_queue.name
+        reply_queue.subscribe(:block => false) do |delivery_info, meta, payload|
+          if meta[:correlation_id] == correlation_id
+            result = payload
+            logger.debug "Liebre: Received response '#{result}'"
+            channel.consumers[delivery_info.consumer_tag].cancel
+          end
+        end
+        logger.debug "Liebre: Publishing '#{message}' with '#{options}' to exchange: #{exchange}"
+        exchange.publish message, options
         begin
-          correlation_id = options[:correlation_id] ||= generate_uuid
-          reply_queue = reply_queue correlation_id
-          options[:reply_to] = reply_queue.name
-          exchange.publish message, options
-          Timeout::timeout(Liebre.config.rpc_request_timeout) do
-            reply_queue.subscribe(:block => true) do |delivery_info, meta, payload|
-              if meta[:correlation_id] == correlation_id
-                result = payload
-                channel.consumers[delivery_info.consumer_tag].cancel
-              end
-            end
+          Timeout.timeout(Liebre.config.rpc_request_timeout) do
+            sleep 0.01 while result.nil?
           end
         rescue Timeout::Error
           #do nothing
@@ -51,7 +55,7 @@ module Liebre
     end
     
     def exchange
-      Liebre::Common::Utils.create_exchange channel, exchange_config
+      @exchange ||= Liebre::Common::Utils.create_exchange channel, exchange_config
     end
     
     def channel
@@ -81,6 +85,10 @@ module Liebre
     def generate_uuid
       SecureRandom.uuid
     end
+        
+    def logger
+      Liebre::Config.logger
+    end
     
     attr_reader :publisher_name
 

data/lib/liebre/runner/starter/consumer.rb

@@ -19,15 +19,18 @@ module Liebre
         
         def initialize_queue
           queue.subscribe(:manual_ack => true) do |info, meta, payload|
+            response = :reject
             begin
-              logger.debug "Received message for #{klass.name}: #{payload} - #{meta}"
+              logger.debug "Liebre: Received message for #{klass.name}: #{payload} - #{meta}"
               consumer = klass.new(payload, meta)
               response = consumer.call
-              handler.respond response, info
             rescue => e
+              response = :error
               logger.error e.inspect
               logger.error e.backtrace.join("\n")
-              handler.respond :error, info
+            ensure
+              logger.debug "Liebre: Responding with #{response}"
+              handler.respond response, info
             end
           end
         end
@@ -71,7 +74,6 @@ module Liebre
           result = clone_hash config
           result['exchange']['name'] += "-error"
           result['queue']['name'] += "-error"
-          result['queue']['opts']['exclusive'] = true
           result
         end
         

data/lib/liebre/runner/starter/rpc.rb

@@ -6,7 +6,7 @@ module Liebre
         def call
           queue.subscribe(:manual_ack => false) do |_info, meta, payload|
             begin
-              logger.debug "Received message for #{klass.name}: #{payload} - #{meta}"
+              logger.debug "Liebre: Received message for #{klass.name}: #{payload} - #{meta}"
               consumer = klass.new(payload, meta, callback(meta))
               consumer.call
             rescue => e
@@ -26,7 +26,7 @@ module Liebre
           }
 
           lambda do |response| 
-            logger.debug "Responding with #{response}"
+            logger.debug "Liebre: Responding with #{response}"
             exchange.publish(response, opts)
           end
         end

data/lib/liebre/runner.rb

@@ -28,9 +28,9 @@ module Liebre
 
     def do_shutdown
       Thread.start do
-        logger.info("Closing AMQP connection...")
+        logger.info("Liebre: Closing AMQP connection...")
         conn_manager.stop
-        logger.info("AMQP connection closed")
+        logger.info("Liebre: AMQP connection closed")
       end.join
     end
 
@@ -42,7 +42,7 @@ module Liebre
     def log_and_wait e
       logger.warn(e)
       sleep(retry_interval)
-      logger.warn("Retrying connection")
+      logger.warn("Liebre: Retrying connection")
     end
 
     def logger

data/lib/liebre/version.rb

@@ -1,5 +1,5 @@
 module Liebre
   
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 
 end

data/spec/liebre/publisher_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe Liebre::Publisher do
       expect(exchange).to receive(:publish).with message, 
         {:correlation_id => correlation_id, :reply_to => reply_queue_name}
       
-      expect(reply_queue).to receive(:subscribe).with(:block => true) do |&block|
+      expect(reply_queue).to receive(:subscribe).with(:block => false) do |&block|
         expect(channel).to receive(:consumers).and_return consumers
         expect(consumer).to receive(:cancel)
         

data/spec/liebre/runner/starter/consumer_spec.rb

@@ -43,8 +43,7 @@ RSpec.describe Liebre::Runner::Starter::Consumer do
       "queue" => {
         "name" => "test_queue-error",
         "opts" => {
-          "durable" => true,
-          "exclusive" => true
+          "durable" => true
         }        
       }
     }

data/spec/liebre/runner/starter/rpc_spec.rb

@@ -47,14 +47,16 @@ RSpec.describe Liebre::Runner::Starter::RPC do
     
   let(:reply_to)       { "queue_to_reply_to" }
   let(:correlation_id) { 123 }
+  let(:headers)        { {} }
   let :meta do
     double 'meta', 
       :reply_to       => reply_to,
-      :correlation_id => correlation_id
+      :correlation_id => correlation_id,
+      :headers        => headers
   end
   
   let :opts do
-    {:routing_key => reply_to, :correlation_id => correlation_id}
+    {:routing_key => reply_to, :correlation_id => correlation_id, :headers => headers}
   end
   
   let(:handler) { double 'handler' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liebre
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - jcabotc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny