queueing_rabbit 0.5.0 → 0.6.0

data/lib/queueing_rabbit/client/amqp.rb

@@ -78,7 +78,7 @@ module QueueingRabbit
       def close
         info "closing AMQP broker connection..."
 
-        connection.close do
+        connection.disconnect do
           yield if block_given?
 
           EM.stop if EM.reactor_running?
@@ -142,6 +142,14 @@ module QueueingRabbit
         EM.next_tick(&block)
       end
 
+      def wait_while_for(proc, period, _ = nil, &block)
+        if proc.call
+          EM.add_timer(period, &block)
+        else
+          block.call
+        end
+      end
+
       def begin_worker_loop
         EM.run do
           yield if block_given?

data/lib/queueing_rabbit/client/bunny.rb

@@ -15,7 +15,11 @@ module QueueingRabbit
         end
 
         def ack
-          @channel.ack(@delivery_info.delivery_tag, false)
+          @channel.ack(delivery_tag, false)
+        end
+
+        def delivery_tag
+          @delivery_info.delivery_tag
         end
 
         def headers
@@ -117,6 +121,17 @@ module QueueingRabbit
         end
       end
 
+      def wait_while_for(proc, seconds, interval = 0.5)
+        end_time = Time.now.to_i + seconds
+
+        while Time.now.to_i < end_time do
+          return unless proc.call
+          sleep interval
+        end
+
+        yield
+      end
+
     private
 
       def initialize(connection)

data/lib/queueing_rabbit/configuration.rb

@@ -16,6 +16,10 @@ module QueueingRabbit
       @heartbeat ||= 10
     end
 
+    def jobs_wait_timeout
+      @jobs_wait_timeout ||= 5
+    end
+
     def default_client
       QueueingRabbit::Client::Bunny
     end

data/lib/queueing_rabbit/version.rb

@@ -1,3 +1,3 @@
 module QueueingRabbit
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/queueing_rabbit/worker.rb

@@ -1,3 +1,5 @@
+require 'monitor'
+
 module QueueingRabbit
   class Worker
 
@@ -10,13 +12,44 @@ module QueueingRabbit
     def initialize(*jobs)
       self.jobs = jobs.map { |job| job.to_s.strip }
 
+      @messages_lock = Monitor.new
+      @messages = {}
+      @channels = []
+
       sync_stdio
       validate_jobs
       constantize_jobs
     end
 
+    def checked_messages_count
+      @messages_lock.synchronize do
+        @messages.count
+      end
+    end
+
+    def checkin_message(delivery_tag)
+      return unless @working
+
+      @messages_lock.synchronize do
+        @messages[delivery_tag] = true
+      end
+    end
+
+    def checkout_message(delivery_tag)
+      @messages_lock.synchronize do
+        @messages.delete(delivery_tag)
+      end
+    end
+
+    def working?
+      @working
+    end
+
     def work
-      trap_signals
+      return if working?
+
+      @working = true
+      @channels = []
 
       QueueingRabbit.trigger_event(:worker_ready)
 
@@ -26,6 +59,10 @@ module QueueingRabbit
     end
 
     def work!
+      return if working?
+
+      trap_signals
+
       info "starting a new queueing_rabbit worker #{self}"
 
       QueueingRabbit.begin_worker_loop { work }
@@ -59,10 +96,12 @@ module QueueingRabbit
 
     def stop(connection = QueueingRabbit.connection)
       connection.next_tick do
-        connection.close do
-          info "gracefully shutting down the worker #{self}"
-          remove_pidfile
-          QueueingRabbit.trigger_event(:consuming_done)
+        @working = false
+        close_channels do
+          connection.close do
+            info "gracefully shutting down the worker #{self}"
+            remove_pidfile
+          end
         end
       end
     end
@@ -85,6 +124,15 @@ module QueueingRabbit
 
   private
 
+    def close_channels(connection = QueueingRabbit.connection)
+      connection.wait_while_for(Proc.new { checked_messages_count > 0 },
+                                QueueingRabbit.jobs_wait_timeout) do
+        @channels.each(&:close)
+        QueueingRabbit.trigger_event(:consuming_done)
+        yield
+      end
+    end
+
     def validate_jobs
       if jobs.nil? || jobs.empty?
         fatal "no jobs specified to work on."
@@ -104,9 +152,13 @@ module QueueingRabbit
     end
 
     def run_job(conn, job)
-      QueueingRabbit.follow_job_requirements(job) do |_, _, queue|
+      QueueingRabbit.follow_job_requirements(job) do |ch, _, queue|
+        @channels << ch
         conn.listen_queue(queue, job.listening_options) do |payload, metadata|
-          invoke_job(job, payload, metadata)
+          if checkin_message(metadata.object_id)
+            invoke_job(job, payload, metadata)
+            checkout_message(metadata.object_id)
+          end
         end
       end
     end

data/lib/queueing_rabbit.rb

@@ -90,23 +90,27 @@ module QueueingRabbit
   end
 
   def follow_job_requirements(job)
+    ret = nil
     follow_bus_requirements(job) do |ch, ex|
       conn.define_queue(ch, job.queue_name, job.queue_options) do |q|
         if job.bind_queue?
           job.binding_declarations.each { |o| conn.bind_queue(q, ex, o) }
         end
 
-        yield ch, ex, q
+        ret = yield ch, ex, q
       end
     end
+    ret
   end
 
   def follow_bus_requirements(bus)
+    ret = nil
     conn.open_channel(bus.channel_options) do |ch, _|
       conn.define_exchange(ch, bus.exchange_name, bus.exchange_options) do |ex|
-        yield ch, ex
+        ret = yield ch, ex
       end
     end
+    ret
   end
 
   def queue_size(job)

data/spec/integration/worker_termination_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'Terminating a worker' do
+
+  include_context 'Auto-disconnect'
+  include_context 'StringIO logger'
+  
+  let(:queue) { Queue.new }
+  let(:job_name) { 'SleepAndAckJob' }
+  let(:job) {
+    Class.new(QueueingRabbit::AbstractJob) {
+      queue 'sleep_and_ack'
+      listen :ack => true
+
+      def self.complete!
+        @complete = true
+      end
+
+      def self.complete?
+        !!@complete
+      end
+
+      def perform
+        sleep 3
+        self.class.complete!
+        acknowledge
+      end
+    }
+  }
+
+  before do
+    QueueingRabbit.purge_queue(job)
+    stub_const(job_name, job)
+  end
+
+  it "waits for currently running consumers" do
+    worker = QueueingRabbit::Worker.new(job_name)
+    worker.work
+    job.enqueue('')
+    sleep 1
+    worker.stop
+    expect(job).to be_complete
+  end
+
+end

data/spec/unit/queueing_rabbit/client/amqp_spec.rb

@@ -139,7 +139,7 @@ describe QueueingRabbit::Client::AMQP do
     describe '#close' do
       before do
         subject.should_receive(:info)
-        connection.should_receive(:close).and_yield
+        connection.should_receive(:disconnect).and_yield
         EM.should_receive(:stop)
       end
 

data/spec/unit/queueing_rabbit/worker_spec.rb

@@ -197,6 +197,7 @@ describe QueueingRabbit::Worker do
 
       it 'closes the connection, removes the pidfile and reports the event' do
         connection.should_receive(:next_tick).and_yield
+        connection.should_receive(:wait_while_for).and_yield
         connection.should_receive(:close).and_yield
         File.stub(:exists?).with(file_name).and_return(true)
         File.should_receive(:delete).with(file_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: queueing_rabbit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -136,6 +136,7 @@ files:
 - spec/integration/synchronous_publishing_and_consuming_spec.rb
 - spec/integration/synchronous_publishing_and_threaded_consuming_spec.rb
 - spec/integration/synchronous_publishing_spec.rb
+- spec/integration/worker_termination_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts.rb
 - spec/unit/queueing_rabbit/buses/abstract_bus_spec.rb
@@ -171,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2464755371986051547
+      hash: 657465743539399174
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2464755371986051547
+      hash: 657465743539399174
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -205,6 +206,7 @@ test_files:
 - spec/integration/synchronous_publishing_and_consuming_spec.rb
 - spec/integration/synchronous_publishing_and_threaded_consuming_spec.rb
 - spec/integration/synchronous_publishing_spec.rb
+- spec/integration/worker_termination_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts.rb
 - spec/unit/queueing_rabbit/buses/abstract_bus_spec.rb