vx-consumer 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92feb250ce6331845ed2c8068a4a9980ba31366a
-  data.tar.gz: fa5b5b57e16f73360bb70336e497d75ccbd4cc7c
+  metadata.gz: 98dc0b2f078519ea2ccf52a5467cdfbebce98652
+  data.tar.gz: 405b389c6672e9ce777c44759e2b7422aa4d1555
 SHA512:
-  metadata.gz: fa37bf84b361bf10901ad059e21d5dc6c1c8e8d502d1a2d65c52c196a854bbaec8ad83618d28f5b20ff213415f4df0d8b0c1369c562085d532671fbc68b04587
-  data.tar.gz: ed001b0fe9ccea0e2a8d84125baed135657f7e6ba61a02ce1ea61242e21b29d7143c2880e5fcf0d7dbc64eee7b30b7544c56e08eb3741d033b0f7bcad67fe447
+  metadata.gz: c880219d1bd3c939a1a0a217b36053447736ed054b7b05bb00f15c00ad23d9a88395260b407e54c7a44619b1ad7150ad0c4d4ec5231ea8517e95ba4749cb8a2c
+  data.tar.gz: ecff22e7ec25e566353fb6526dca1f967c6f3bae88d827d7efcb707abbfc2433db413166bb471c9dce42a9a0c6870b4a713e0bf3ae7fc6ffc19182eaea2076ae

data/lib/vx/consumer/ack.rb

@@ -8,8 +8,8 @@ module Vx
           properties:    properties,
           multiple:      multiple,
         }
-        if channel.open?
-          channel.ack delivery_info.delivery_tag, multiple
+        if _channel.open?
+          _channel.ack delivery_info.delivery_tag, multiple
           instrument("ack", instrumentation)
           true
         else
@@ -25,8 +25,8 @@ module Vx
           multiple:      multiple,
           requeue:       requeue,
         }
-        if channel.open?
-          channel.ack delivery_info.delivery_tag, multiple, requeue
+        if _channel.open?
+          _channel.ack delivery_info.delivery_tag, multiple, requeue
           instrument("nack", instrumentation)
           true
         else

data/lib/vx/consumer/session.rb

@@ -7,20 +7,34 @@ module Vx
 
       include Instrument
 
-      @@session_lock = Mutex.new
+      @@session_lock  = Mutex.new
+
+      @@shutdown_lock = Mutex.new
+      @@shutdown      = ConditionVariable.new
+      @@live          = false
 
       attr_reader :conn
 
       def shutdown
-        @shutdown = true
+        @@shutdown_lock.synchronize do
+          @@live = false
+          @@shutdown.broadcast
+        end
       end
 
-      def shutdown?
-        !!@shutdown
+      def live?
+        @@live
       end
 
       def resume
-        @shutdown = false
+        @@live = true
+      end
+
+      def wait_shutdown(timeout = nil)
+        @@shutdown_lock.synchronize do
+          @@shutdown.wait(@@shutdown_lock, timeout)
+          not live?
+        end
       end
 
       def close

data/lib/vx/consumer/subscribe.rb

@@ -4,31 +4,44 @@ module Vx
 
       def subscribe
         ch, q = bind
-        bunny_consumer = q.subscribe(block: false, ack: params.ack) do |delivery_info, properties, payload|
-          payload = decode_payload properties, payload
 
-          instrumentation = {
-            consumer:   params.consumer_name,
-            payload:    payload,
-            properties: properties,
-          }
+        subscriber = Subscriber.new(
+          ch,
+          q,
+          ch.generate_consumer_tag,
+          !params.ack
+        )
+        subscriber.vx_consumer_name = params.consumer_name
 
-          with_middlewares :sub, instrumentation do
-            instrument("start_processing", instrumentation)
-            instrument("process", instrumentation) do
-              run_instance delivery_info, properties, payload, ch
-            end
-          end
+        subscriber.on_delivery do |delivery_info, properties, payload|
+          handle_delivery ch, delivery_info, properties, payload
         end
 
-        Subscriber.new(bunny_consumer)
+        q.subscribe_with(subscriber)
+      end
+
+      def handle_delivery(channel, delivery_info, properties, payload)
+        payload = decode_payload properties, payload
+
+        instrumentation = {
+          consumer:   params.consumer_name,
+          payload:    payload,
+          properties: properties,
+        }
+
+        with_middlewares :sub, instrumentation do
+          instrument("start_processing", instrumentation)
+          instrument("process", instrumentation) do
+            run_instance delivery_info, properties, payload, channel
+          end
+        end
       end
 
       def run_instance(delivery_info, properties, payload, channel)
         new.tap do |inst|
           inst.properties    = properties
           inst.delivery_info = delivery_info
-          inst.channel       = channel
+          inst._channel      = channel
         end.perform payload
       end
 

data/lib/vx/consumer/subscriber.rb

@@ -1,24 +1,49 @@
+require 'thread'
+require 'bunny/consumer'
+
 module Vx
   module Consumer
-    Subscriber = Struct.new(:consumer) do
+    class Subscriber < Bunny::Consumer
+
+      include Instrument
+
+      attr_accessor :vx_consumer_name
+
+      def initialize(*args)
+        super(*args)
+        @lock = Mutex.new
+      end
+
+      def graceful_shutdown
+        instrument('graceful_shutdown_consumer', consumer: vx_consumer_name)
+        in_progress { cancel }
+      end
+
+      def in_progress
+        @lock.synchronize do
+          yield
+        end
+      end
+
+      def call(*args)
+        in_progress do
+          @on_delivery.call(*args) if @on_delivery
+        end
+      end
 
       def cancel
-        consumer.cancel
-        consumer.channel.close unless consumer.channel.closed?
+        instrument('cancel_consumer', consumer: vx_consumer_name)
+        super
+        channel.close unless channel.closed?
       end
 
       def join
-        consumer.channel.work_pool.join
+        channel.work_pool.join
       end
 
-      def wait
-        loop do
-          if Consumer.shutdown?
-            cancel
-            break
-          end
-          sleep Consumer.configuration.pool_timeout
-        end
+      def wait_shutdown
+        Consumer.wait_shutdown
+        cancel
       end
 
     end

data/lib/vx/consumer/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Consumer
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/lib/vx/consumer.rb

@@ -19,7 +19,7 @@ module Vx
 
     attr_accessor :properties
     attr_accessor :delivery_info
-    attr_accessor :channel
+    attr_accessor :_channel
 
     def self.included(base)
       base.extend ClassMethods
@@ -95,8 +95,12 @@ module Vx
       session.shutdown
     end
 
-    def shutdown?
-      session.shutdown?
+    def live?
+      session.live?
+    end
+
+    def wait_shutdown(timeout = nil)
+      session.wait_shutdown(timeout)
     end
 
     def configure

data/spec/lib/consumer_spec.rb

@@ -93,9 +93,9 @@ describe Vx::Consumer do
     Bob.publish a: 1
 
     th = Thread.new {
-      consumer.wait
+      consumer.wait_shutdown
     }
-    sleep 1
+    sleep 0.2
     Vx::Consumer.shutdown
 
     Timeout.timeout(1) do
@@ -105,6 +105,21 @@ describe Vx::Consumer do
     expect(Bob._collected).to eq(["a" => 1])
   end
 
+  it "should work with graceful shutdown" do
+    consumer = Bob.subscribe
+    10.times do |n|
+      Bob.publish a: n
+    end
+
+    sleep 0.2
+    Timeout.timeout(1) do
+      consumer.graceful_shutdown
+    end
+
+    expect(Bob._collected).to have_at_least(2).item
+    expect(Bob._collected).to have_at_most(8).item
+  end
+
   def handle_errors
     begin
       yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-consumer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny