lapine 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51e76e478a844476113f4887a3c5c81047f294d0
-  data.tar.gz: 6202a4b8f09226c9a542f29b7e67677b64dd3881
+  metadata.gz: 606eec9764b4ad0c59adde34f12ba6eac251657a
+  data.tar.gz: 2acceab836b17cfe7a7c8121c149d6a176ebb7e9
 SHA512:
-  metadata.gz: 95fab589bbbde3e8c010d33712048215abfa157ca797e5f6067f026c9aa329b213c04922fc92c3f2eba8d52a2806603bf227f10017b7663da1ebf4f47c0524de
-  data.tar.gz: 809130f354affa21711f4b1554a953f323d33e97ce3a2253ae6ff1ee63e8b96d9d9262d84de1d58af36f2add7bf099500de8c203851a0c3a9a8d335887214f21
+  metadata.gz: fc643eec3ba896154c77828b7db6833c4eb2d11f018fb27a8fbb65490a3e2a9f3d246fef82292a3274910d60c1ffa7f2d6b04fe07f95bd8d1924076618d894c5
+  data.tar.gz: 06e26f733603299950b18f2b499d1d7ea3ca83a767b2677dd52c7429579df9580abf3997dec658a2b3a212f22cf39719bb319f5012f138b0a12003aef565793f

data/lib/lapine/consumer/config.rb

@@ -82,6 +82,10 @@ module Lapine
         config[:logfile]
       end
 
+      def delete_queues
+        yaml_config['delete_queues'] || []
+      end
+
       def queues
         yaml_config['queues'] || []
       end

data/lib/lapine/consumer/runner.rb

@@ -28,23 +28,28 @@ module Lapine
 
         @queue_properties = queue_properties
         EventMachine.run do
-          topology.each_binding do |q, conn, routing_key, classes|
+          topology.each_binding do |q, conn, routing_key, handlers|
             queue = conn.channel.queue(q, @queue_properties).bind(conn.exchange, routing_key: routing_key)
             queue.subscribe(ack: true) do |metadata, payload|
+              process(metadata, payload, handlers)
+              EventMachine.stop_event_loop if should_exit?
+            end
+            queues << queue
+          end
 
-              message = Consumer::Message.new(payload, metadata, logger)
-              Middleware.app.call(message) do |message|
-                classes.each do |clazz|
-                  Lapine::Consumer::Dispatcher.new(clazz, message).dispatch
-                end
+          topology.each_queue_to_delete do |q, conn, routing_key, handlers|
+            # if queue does not exist in RabbitMQ, skip processing
+            # else
+            queue = conn.channel.queue(q, @queue_properties)
+            queues_to_delete << queue
 
-                if config.debug?
-                  @message_count += 1
-                  @running_message_count += 1
-                end
-              end
+            queue.subscribe(ack: true) do |metadata, payload|
+              process(metadata, payload, handlers)
+            end
 
-              EventMachine.stop_event_loop if should_exit?
+            EventMachine.add_timer(0.5) do
+              logger.info "Lapine::Consumer unbinding #{queue.name} from exchange: #{exchange.name}, routing_key: #{routing_key}"
+              queue.unbind(conn.exchange, routing_key: routing_key)
             end
           end
 
@@ -58,6 +63,8 @@ module Lapine
           EventMachine.add_periodic_timer(5) do
             EventMachine.stop_event_loop if should_exit?
           end
+
+          schedule_queue_deletion
         end
 
         logger.warn 'exiting Lapine::Consumer'
@@ -90,6 +97,54 @@ module Lapine
         Signal.trap('INT') { EventMachine.stop }
         Signal.trap('TERM') { $STOP_LAPINE_CONSUMER = true }
       end
+
+      private
+
+      def queues
+        @queues ||= []
+      end
+
+      def queues_to_delete
+        @queues_to_delete ||= []
+      end
+
+      def schedule_queue_deletion
+        EventMachine.add_timer(30) do
+          queues_to_delete.each do |queue|
+            logger.info "Lapine::Consumer checking #{queue.name} for deletion"
+
+            begin
+              queue.status do |message_count, consumer_count|
+                if message_count == 0
+                  logger.info "Lapine::Consumer deleting #{queue.name}"
+                  queue.unsubscribe
+                  queue.delete unless config.transient?
+                  queues_to_delete.delete(queue)
+                else
+                  logger.info "Lapine::Consumer skipping #{queue.name} deletion, message count: #{message_count}"
+                  schedule_queue_deletion
+                end
+              end
+            rescue => e
+              logger.error "Unable to delete queue #{queue.name}, error: #{e.message}"
+            end
+          end
+        end
+      end
+
+      def process(metadata, payload, handlers)
+        message = Consumer::Message.new(payload, metadata, logger)
+        Middleware.app.call(message) do |message|
+          handlers.each do |handler|
+            Lapine::Consumer::Dispatcher.new(handler, message).dispatch
+          end
+
+          if config.debug?
+            @message_count += 1
+            @running_message_count += 1
+          end
+        end
+      end
     end
   end
 end

data/lib/lapine/consumer/topology.rb

@@ -6,16 +6,17 @@ module Lapine
 
       def each_binding
         config.queues.each do |node|
-          classes = node['handlers'].map do |handler|
-            handler.split('::').inject(Object) do |const, name|
-              const.const_get(name)
-            end
-          end
-
+          classes = classify(node['handlers'])
           yield node['q'], get_conn(node['topic']), node['routing_key'], classes
         end
       end
 
+      def each_queue_to_delete
+        config.delete_queues.each do |node|
+          classes = classify(node['handlers'])
+          yield node['q'], get_conn(node['topic']), node['routing_key'], classes
+        end
+      end
 
       def each_topic
         config.topics.each do |topic|
@@ -32,6 +33,15 @@ module Lapine
 
       private
 
+      def classify(handlers)
+        return [] unless handlers
+        handlers.map do |handler|
+          handler.split('::').inject(Object) do |const, name|
+            const.const_get(name)
+          end
+        end
+      end
+
       def get_conn(name)
         @cons ||= {}.tap do |cons|
           each_topic do |topic|

data/lib/lapine/version.rb

@@ -1,3 +1,3 @@
 module Lapine
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/spec/lib/lapine/consumer/config_spec.rb

@@ -170,6 +170,23 @@ RSpec.describe Lapine::Consumer::Config do
     end
   end
 
+  describe '#delete_queues' do
+    let(:config_from_file) { {} }
+
+    it 'defaults to empty array' do
+      expect(config.delete_queues).to eq([])
+    end
+
+    context 'with an array' do
+      let(:config_from_file) { {'delete_queues' => ['a.b.c', 'e.f.g']} }
+
+      it 'reads from config' do
+        expect(config.delete_queues).to eq(['a.b.c', 'e.f.g'])
+      end
+
+    end
+  end
+
   describe '#transient?' do
     it 'is false by default' do
       expect(config.transient?).to be false

data/spec/lib/lapine/consumer/runner_spec.rb

@@ -39,11 +39,13 @@ RSpec.describe Lapine::Consumer::Runner do
     connection_properties: connection_properties,
     require: [],
     queues: queues,
+    delete_queues: delete_queues,
     topics: ['testing.topic'],
     debug?: true,
     transient?: true) }
   let(:connection_properties) { {host: '127.0.0.1', port: 5672, ssl: false, vhost: '/', username: 'guest', password: 'guest'} }
   let(:message) { Oj.dump({'pay' => 'load'}) }
+  let(:delete_queues) { [] }
 
   describe '#run' do
     before do

data/spec/lib/lapine/consumer/topology_spec.rb

@@ -9,26 +9,27 @@ RSpec.describe Lapine::Consumer::Topology do
 
   let(:topics) {
     [
-      "a.topic",
-      "b.topic"
+      'a.topic',
+      'b.topic'
     ]
   }
   let(:queues) {
     [{
-      "q" => "store.buyable",
-      "topic" => "a.topic",
-      "routing_key" =>
-      "store.buyable.update",
-        "handlers" => ["MessageBusTest::Clazz"]
+      'q' => 'store.buyable',
+      'topic' => 'a.topic',
+      'routing_key' => 'store.buyable.update',
+      'handlers' => ['MessageBusTest::Clazz']
     }]
   }
   let(:connection_properties) {
     {}
   }
+  let(:queues_to_delete) { [] }
   let(:config) do
     double('config',
            topics: topics,
            queues: queues,
+           delete_queues: queues_to_delete,
            connection_properties: connection_properties,
            debug?: debug)
   end
@@ -37,33 +38,53 @@ RSpec.describe Lapine::Consumer::Topology do
   let(:debug) { false }
   let(:logger) { nil }
 
-  describe "#each_topic" do
-    it "yields correct dount" do
+  describe '#each_topic' do
+    it 'yields correct dount' do
       expect { |b| topology.each_topic(&b) }.to yield_control.twice
     end
 
-    it "yields all topics in order" do
-      expect { |b| topology.each_topic(&b) }.to yield_successive_args("a.topic", "b.topic")
+    it 'yields all topics in order' do
+      expect { |b| topology.each_topic(&b) }.to yield_successive_args('a.topic', 'b.topic')
     end
   end
 
-  describe "#each_binding" do
+  describe '#each_queue_to_delete' do
+    let(:conn) { double('connection') }
+    let(:queues_to_delete) { [
+      {'q' => 'queue.name', 'topic' => 'a.topic', 'handlers' => ['MessageBusTest::Clazz']},
+      {'q' => 'other.queue.name', 'topic' => 'a.topic', 'handlers' => ['MessageBusTest::Clazz']}
+    ] }
+    before do
+      allow(Lapine::Consumer::Connection).to receive(:new) { conn }
+    end
+
+    it 'yields queue name with connection' do
+      expect { |b|
+        topology.each_queue_to_delete(&b)
+      }.to yield_successive_args(
+        ['queue.name', conn, nil, [MessageBusTest::Clazz]],
+        ['other.queue.name', conn, nil, [MessageBusTest::Clazz]]
+      )
+    end
+  end
+
+  describe '#each_binding' do
     let(:conn) { double('connection') }
 
     before do
       allow(Lapine::Consumer::Connection).to receive(:new) { conn }
     end
 
-    it "yields correct count" do
+    it 'yields correct count' do
       expect { |b| topology.each_binding(&b) }.to yield_control.once
     end
 
-    it "yields expected arguments" do
+    it 'yields expected arguments' do
       expect { |b|
         topology.each_binding(&b)
-      }.to yield_with_args("store.buyable",
+      }.to yield_with_args('store.buyable',
         conn,
-        "store.buyable.update",
+        'store.buyable.update',
         [MessageBusTest::Clazz])
     end
 

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'lapine'
 require 'pry'
 require 'rspec/mocks'
+require 'lapine/consumer/dispatcher'
+require 'lapine/consumer/middleware'
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each do |f|
   require f

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lapine
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Eric Saxby
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp