liebre 0.1.14 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 014ac3efcc92a40a6fe079b207ef4fd1aaa20c18
-  data.tar.gz: 26e318d49913b320bacba4f1e449f108ab8d64c3
+  metadata.gz: 4f381b98ce6cd5cce5fbab983cc33835d3cb00b3
+  data.tar.gz: af785cc0a08bd0f0f50b837f3784377fdfb3e96c
 SHA512:
-  metadata.gz: 93dfa35403a31835cf96bf12d12c8473f310bce257a1a7675053f46dd073fe5f2f32467555eecb4234e1f5b752268393a8650e3a33d5991b53cc4833c3a5c3eb
-  data.tar.gz: d504a8b11eb7668610ce3feeb5a99e6bebd497c7b0c6f4db149d0cd130e8c53117c4d286b6ae41ad792e4ac58d958e32aa8c2c58ec8267884da011529ce4c26c
+  metadata.gz: d5ca6a8a9998ce0304141a4ba9ea8a0fba34af5b3ab4f203bdf16479a47094ebfa8cdb31839f5e5896e90e5539d153a7676165590788bc7e7f37641f8ecc406f
+  data.tar.gz: f63a7728f1897337ab44ae4465c2614152795dd348226d76cc2a728ef51ea91003e3dbd4e7bd196ec7014358b3444c85e4cf0a4319c3a34890de58dce59a4bca

data/Gemfile.lock

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

data/lib/liebre/common/utils.rb

@@ -5,7 +5,11 @@ module Liebre
       @@mutex = Mutex.new
       
       def self.mutex_sync
-        @@mutex.synchronize do
+        unless @@mutex.locked?
+          @@mutex.synchronize do
+            yield
+          end
+        else
           yield
         end
       end

data/lib/liebre/publisher.rb

@@ -8,7 +8,7 @@ module Liebre
     def enqueue message, options = {}
       with_connection do
         exchange = exchange_for default_channel
-        logger.debug "Liebre: Publishing '#{message}' with '#{options}' to exchange: #{exchange.name}"
+        logger.debug "Liebre# Publishing '#{message}' with '#{options}' to exchange: #{exchange.name}"
         exchange.publish message, options
       end
     end
@@ -22,12 +22,12 @@ module Liebre
         reply_queue.subscribe(:block => false) do |delivery_info, meta, payload|
           if meta[:correlation_id] == correlation_id
             result = payload
-            logger.debug "Liebre: Received response '#{result}'"
+            logger.debug "Liebre# Received response '#{result}'"
             channel.consumers[delivery_info.consumer_tag].cancel
           end
         end
         exchange = exchange_for channel
-        logger.debug "Liebre: Publishing '#{message}' with '#{options}' to exchange: #{exchange.name}"
+        logger.debug "Liebre# Publishing '#{message}' with '#{options}' to exchange: #{exchange.name}"
         exchange.publish message, options
         begin
           Timeout.timeout(Liebre.config.rpc_request_timeout) do
@@ -57,9 +57,12 @@ module Liebre
     
     def with_rpc_channel
       with_connection do
-        channel = connection_manager.get(connection_name).create_channel
-        yield(channel)
-        channel.close
+        Common::Utils.mutex_sync do
+          channel = connection_manager.get(connection_name).create_channel
+          channel.prefetch 1
+          yield(channel)
+          channel.close
+        end
       end
     end
     

data/lib/liebre/runner.rb

@@ -28,26 +28,30 @@ module Liebre
 
     def do_shutdown
       Thread.start do
-        logger.info("Liebre: Closing AMQP connection...")
+        logger.info("Liebre# Closing AMQP connection...")
+        consumers.stop
         connection_manager.stop
-        logger.info("Liebre: AMQP connection closed")
+        logger.info("Liebre# AMQP connection closed")
       end.join
     end
 
     def start_consumers
-      consumers = Consumers.new(connection_manager)
       consumers.start_all
     end
 
     def log_and_wait e
       logger.warn(e)
       sleep(retry_interval)
-      logger.warn("Liebre: Retrying connection")
+      logger.warn("Liebre# Retrying connection")
     end
 
     def logger
       Liebre.logger
     end
+    
+    def consumers
+      @consumers ||= Consumers.new(connection_manager)
+    end
 
     def connection_manager
       @connection_manager ||= ConnectionManager.instance

data/lib/liebre/runner/consumers.rb

@@ -4,6 +4,7 @@ module Liebre
 
       def initialize connection_manager
         @connection_manager = connection_manager
+        @threads = []
       end
     
       def consumer_names
@@ -11,7 +12,15 @@ module Liebre
       end
 
       def start_all
-        consumer_names.each { |name| start(name) }
+        consumer_names.each do |name|
+          start(name)
+        end
+      end
+      
+      def stop
+        threads.each do |starter| 
+          starter.stop
+        end
       end
 
       def start name
@@ -19,7 +28,8 @@ module Liebre
         num_threads = params.fetch("num_threads", 1)
         num_threads.times do
           starter = Starter.new(connection_manager, params)
-          starter.call
+          starter.start
+          threads << starter
         end
       end
 
@@ -29,7 +39,7 @@ module Liebre
         Liebre.config.consumers
       end
 
-      attr_reader :connection_manager
+      attr_reader :connection_manager, :threads
 
     end
   end

data/lib/liebre/runner/starter.rb

@@ -11,8 +11,12 @@ module Liebre
         @config = config
       end
 
-      def call
-        consumer_class.new(connection, config).call
+      def start
+       @consumer = consumer_class.new(connection, config).start
+      end
+      
+      def stop
+        @consumer.cancel
       end
 
       private

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

@@ -10,31 +10,60 @@ module Liebre
           @config = config
         end
 
-        def call
+        def start
           initialize_error_queue
           initialize_queue
         end
+        
+        def stop
+          if @consumer
+            @consumer.cancel
+            channel.close
+          end
+        end
 
         private
 
         def initialize_queue
-          queue.subscribe(:manual_ack => true) do |info, meta, payload|
+          @consumer = queue.subscribe(:manual_ack => true) do |info, meta, payload|
             response = :reject
+            debug_string = ""
+            elapsed_time = nil
             begin
-              logger.debug "Liebre: Received message for #{klass.name}: #{payload} - #{meta}"
+              debug_string = "Liebre# Received message for #{klass.name}(#{queue.name}): #{payload} - #{meta}"
+              start_at = Time.now
               consumer = klass.new(payload, meta)
               response = consumer.call
-            rescue => e
+              elapsed_time = (Time.now - start_at).to_f * 1000
+            rescue StandardError => e
               response = :error
-              logger.error "Liebre: Error while processing #{klass.name}: #{payload} - #{meta}"
-              logger.error e.inspect
-              logger.error e.backtrace.join("\n")
+              logger.error error_string(e, payload, meta)
+            rescue Exception => e
+              response = :error
+              logger.error error_string(e, payload, meta)
+              handler.respond response, info
+              raise e
             ensure
-              logger.debug "Liebre: Responding with #{response}"
+              debug_string += "\nLiebre# Responding with #{response}"
+              log_result debug_string, elapsed_time
               handler.respond response, info
             end
           end
         end
+        
+        def log_result debug_string, elapsed_time
+          time_string = "\nLiebre# Elapsed time #{elapsed_time} ms"
+          if logger.debug?
+            logger.debug debug_string + time_string
+          else
+            logger.info "Liebre# Received message for #{klass.name}(#{queue.name})" + time_string
+          end
+        end
+        
+        def error_string error, payload, meta
+          "Liebre# Error while processing #{klass.name}(#{queue.name}): #{payload} - #{meta}" + 
+            error.inspect + error.backtrace.join("\n")
+        end
 
         def initialize_error_queue
           Resources.new(connection, error_config).queue

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

@@ -3,15 +3,23 @@ module Liebre
     class Starter
       class RPC < Consumer
 
-        def call
-          queue.subscribe(:manual_ack => false) do |_info, meta, payload|
+        def start
+          @consumer = queue.subscribe(:manual_ack => false) do |_info, meta, payload|
             begin
-              logger.debug "Liebre: Received message for #{klass.name}: #{payload} - #{meta}"
+              debug_string = "Liebre# Received message for #{klass.name}(#{queue.name}): #{payload} - #{meta}"
+              start_at = Time.now
               consumer = klass.new(payload, meta, callback(meta))
               consumer.call
-            rescue => e
-              logger.error e.inspect
-              logger.error e.backtrace.join("\n")
+              elapsed_time = (Time.now - start_at).to_f * 1000
+              log_result debug_string, elapsed_time
+            rescue StandardError => e
+              response = :error
+              logger.error error_string(payload, meta)
+            rescue Exception => e
+              response = :error
+              logger.error error_string(payload, meta)
+              handler.respond response, info
+              raise e
             end
           end
         end
@@ -26,7 +34,7 @@ module Liebre
           }
 
           lambda do |response| 
-            logger.debug "Liebre: Responding with #{response}"
+            logger.debug "Liebre# Responding with #{response}"
             exchange.publish(response, opts)
           end
         end

data/lib/liebre/version.rb

@@ -1,5 +1,5 @@
 module Liebre
 
-  VERSION = "0.1.14"
+  VERSION = "0.1.19"
 
 end

data/spec/liebre/publisher_spec.rb

@@ -65,6 +65,7 @@ RSpec.describe Liebre::Publisher do
     before do
       expect(connection_manager).to receive(:get).with(:default).and_return connection
       expect(connection).to receive(:create_channel).and_return channel
+      expect(channel).to receive(:prefetch).with 1
       expect(channel).to receive(:queue).with(reply_queue_name, :exclusive => true, :auto_delete => true).
         and_return reply_queue
       expect(channel).to receive(:close)

data/spec/liebre/runner/consumers_spec.rb

@@ -49,8 +49,8 @@ RSpec.describe Liebre::Runner::Consumers do
       expect(Liebre::Runner::Starter).to receive(:new).
         with(conn, second_expected_config).and_return(second_starter)
 
-      expect(first_starter ).to receive(:call).exactly(3).times
-      expect(second_starter).to receive(:call)
+      expect(first_starter ).to receive(:start).exactly(3).times
+      expect(second_starter).to receive(:start)
 
       subject.start_all
     end

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

@@ -74,9 +74,10 @@ RSpec.describe Liebre::Runner::Starter::Consumer do
   end
 
   let(:exchange)    { double 'exchange' }
-  let(:queue)       { double 'queue' }
+  let(:queue)       { double 'queue', :name => "queue" }
   let(:error_queue) { double 'error_queue' }
   let(:channel)     { double 'channel' }
+  let(:consumer)    { double 'consumer' }
   let(:payload)     { "the_payload" }
 
   subject { described_class.new(connection, config) }
@@ -120,6 +121,7 @@ RSpec.describe Liebre::Runner::Starter::Consumer do
     
     expect(queue).to receive :subscribe do |&block|
       block.call(deliver_info, meta, payload)
+      consumer
     end
 
     expect(consumer_class).to receive :new do |given_payload, given_meta|
@@ -133,7 +135,11 @@ RSpec.describe Liebre::Runner::Starter::Consumer do
     
     expect(handler).to receive(:respond).with ack, deliver_info
 
-    subject.call
+    subject.start
+    
+    expect(consumer).to receive(:cancel)
+    expect(channel).to receive(:close)
+    subject.stop
   end
     
 end

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

@@ -29,8 +29,9 @@ RSpec.describe Liebre::Runner::Starter::RPC do
   end
 
   let(:exchange) { double 'exchange' }
-  let(:queue)    { double 'queue' }
+  let(:queue)    { double 'queue', :name => "queue" }
   let(:channel)  { double 'channel', :default_exchange => exchange }
+  let(:consumer) { double 'consumer' }
   let(:payload)  { "the_payload" }
   let(:response) { "the_response" }
 
@@ -76,6 +77,7 @@ RSpec.describe Liebre::Runner::Starter::RPC do
       
     expect(queue).to receive :subscribe do |&block|
       block.call(deliver_info, meta, payload)
+      consumer
     end
 
     expect(rpc_class).to receive :new do |given_payload, given_meta, callback|
@@ -88,7 +90,11 @@ RSpec.describe Liebre::Runner::Starter::RPC do
 
     expect(rpc_instance).to receive(:call)
 
-    subject.call
+    subject.start
+    
+    expect(consumer).to receive(:cancel)
+    expect(channel).to receive(:close)
+    subject.stop
   end
     
 end

data/spec/liebre/runner/starter_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 RSpec.describe Liebre::Runner::Starter do
 
   let(:connection_manager) { double 'connection_manager' }
-  let(:connection) { double 'connection' }
+  let(:connection)         { double 'connection' }
+    let(:consumer)         { double 'consumer' }
   
   let(:rpc) { true }
 
@@ -20,14 +21,19 @@ RSpec.describe Liebre::Runner::Starter do
     
     let(:rpc_instance) { double 'rpc_instance' }
 
-    describe '#call' do
+    describe '#start and #stop' do
       
       it 'calls the rpc_class with a callback' do
         expect(connection_manager).to receive(:get).with(:rpc).and_return connection
         expect(described_class::RPC).to receive(:new).with(connection, config).and_return rpc_instance
-        expect(rpc_instance).to receive(:call)
+        expect(rpc_instance).to receive(:start).and_return consumer
 
-        subject.call
+        subject.start
+        
+        expect(consumer).to receive(:stop)
+        
+        subject.stop
+        
       end
     end
   end
@@ -44,14 +50,19 @@ RSpec.describe Liebre::Runner::Starter do
       }
     end
 
-    describe '#call' do
+    describe '#start and #stop' do
       
       it 'calls the rpc_class with a callback' do
         expect(connection_manager).to receive(:get).with(:default).and_return connection
         expect(described_class::Consumer).to receive(:new).with(connection, config).and_return consumer
-        expect(consumer).to receive(:call)
+        expect(consumer).to receive(:start).and_return consumer
 
-        subject.call
+        subject.start
+        
+        expect(consumer).to receive(:stop)
+        
+        subject.stop
+        
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liebre
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.19
 platform: ruby
 authors:
 - jcabotc
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny