action_subscriber 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9575343e64c1b2390a894e3da791c3622d609a6a
-  data.tar.gz: 50b81796945c52e733b4ad3024bf9022986deda7
+  metadata.gz: 0d27515da32650e518b407839d2faac598925427
+  data.tar.gz: 1166ddde96c48ab57b4a7b7aace1effa50778057
 SHA512:
-  metadata.gz: fed4d194dd8ff1ecac1be9e89002578eb19d1e7628ee5ae63e3bd1941739cc783b482706be318652b4cbcd6755edb3ff7012d519eca6f9ea57f673b65d1eca93
-  data.tar.gz: 65de4790022a1b705f13a9a94a175c6dd53b0d85c4cfce1b274ad3657fad25f247e7c59d3b27b78cf551884f1e566ecfdbe14d4d09c0cd82e7f2a40e38d3287a
+  metadata.gz: b4f9a39a8e6e67721b54da8afca7974aeeab211adc40411bfd1f82ce4f4ac51a78245b20bbd89f57410d279ee3028c4fb080869346d981ccaac49b1124008ddb
+  data.tar.gz: 78c68d7e6072dffd4c85485c04407d46daaaac6354bcde86632f9914468296eee4ec8884a0bcab7e2fad3315389cd74b412baea8141fd7e74213057e87c23bce

data/action_subscriber.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   else
     spec.add_dependency 'bunny', '>= 1.5.0'
   end
-  spec.add_dependency 'lifeguard'
+  spec.add_dependency 'lifeguard', '>= 0.0.9'
   spec.add_dependency 'middleware'
   spec.add_dependency 'thor'
 

data/lib/action_subscriber/babou.rb

@@ -96,8 +96,11 @@ module ActionSubscriber
       wait_loops = 0
       ::ActionSubscriber::Babou.stop_receving_messages!
 
-      while ::ActionSubscriber::Threadpool.pool.busy_size > 0 && wait_loops < ::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown
-        puts "waiting for threadpool to empty (#{::ActionSubscriber::Threadpool.pool.busy_size})"
+      while ::ActionSubscriber::Threadpool.busy? && wait_loops < ::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown
+        puts "waiting for threadpools to empty:"
+        ::ActionSubscriber::Threadpool.pools.each do |name, pool|
+          puts "  -- #{name} (remaining: #{pool.busy_size})" if pool.busy_size > 0
+        end
         Thread.pass
         wait_loops = wait_loops + 1
         sleep 1

data/lib/action_subscriber/bunny/subscriber.rb

@@ -17,6 +17,9 @@ module ActionSubscriber
         times_to_pop = [::ActionSubscriber::Threadpool.ready_size, ::ActionSubscriber.config.times_to_pop].min
         times_to_pop.times do
           queues.each do |route, queue|
+            # Handle busy checks on a per threadpool basis
+            next if route.threadpool.busy?
+
             delivery_info, properties, encoded_payload = queue.pop(route.queue_subscription_options)
             next unless encoded_payload # empty queue
             ::ActiveSupport::Notifications.instrument "popped_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -13,6 +13,9 @@ module ActionSubscriber
         times_to_pop = [::ActionSubscriber::Threadpool.ready_size, ::ActionSubscriber.config.times_to_pop].min
         times_to_pop.times do
           queues.each do |route,queue|
+            # Handle busy checks on a per threadpool basis
+            next if route.threadpool.busy?
+
             metadata, encoded_payload = queue.pop(route.queue_subscription_options)
             next unless encoded_payload
             ::ActiveSupport::Notifications.instrument "popped_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name

data/lib/action_subscriber/threadpool.rb

@@ -4,15 +4,14 @@ module ActionSubscriber
     # Class Methods
     #
     def self.busy?
-      pools.any? do |_pool_name, pool|
-        pool.pool_size == pool.busy_size
-      end
+      !ready?
     end
 
     def self.new_pool(name, pool_size = nil)
       fail ArgumentError, "#{name} already exists as a threadpool" if pools.key?(name)
       pool_size ||= ::ActionSubscriber.config.threadpool_size
       pools[name] = ::Lifeguard::InfiniteThreadpool.new(
+        :name => name,
         :pool_size => pool_size
       )
     end
@@ -24,13 +23,14 @@ module ActionSubscriber
     def self.pools
       @pools ||= {
         :default => ::Lifeguard::InfiniteThreadpool.new(
+          :name => :default,
           :pool_size => ::ActionSubscriber.config.threadpool_size
         )
       }
     end
 
     def self.ready?
-      !busy?
+      pools.any? { |_pool_name, pool| !pool.busy? }
     end
 
     def self.ready_size

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/lib/action_subscriber.rb

@@ -81,6 +81,7 @@ module ActionSubscriber
         logger.info "    --    exchange: #{route.exchange}"
         logger.info "    --       queue: #{route.queue}"
         logger.info "    -- routing_key: #{route.routing_key}"
+        logger.info "    --  threadpool: #{route.threadpool.name}, pool_size: #{route.threadpool.pool_size}"
       end
     end
   end

data/spec/lib/action_subscriber/threadpool_spec.rb

@@ -1,32 +1,46 @@
 describe ::ActionSubscriber::Threadpool do
   describe "busy?" do
-    context "when the workers are busy" do
+    context "when the pool is busy" do
       it "returns true" do
-        allow(::ActionSubscriber::Threadpool.pool).to receive(:busy_size).and_return(8)
-        expect(::ActionSubscriber::Threadpool.busy?).to eq(true)
+        allow(::ActionSubscriber::Threadpool).to receive(:ready?).and_return(false)
+        expect(::ActionSubscriber::Threadpool).to be_busy
       end
     end
 
-    context "when there are idle workers" do
+    context "when the pool is not busy" do
       it "returns false" do
-        allow(::ActionSubscriber::Threadpool.pool).to receive(:busy_size).and_return(1)
-        expect(::ActionSubscriber::Threadpool.busy?).to eq(false)
+        allow(::ActionSubscriber::Threadpool).to receive(:ready?).and_return(true)
+        expect(::ActionSubscriber::Threadpool).to_not be_busy
       end
     end
   end
 
   describe "ready?" do
-    context "when the pool is busy" do
+    context "when all the workers are full" do
       it "returns false" do
-        allow(::ActionSubscriber::Threadpool).to receive(:busy?).and_return true
-        expect(::ActionSubscriber::Threadpool.ready?).to eq(false)
+        ::ActionSubscriber::Threadpool.new_pool(:some_dumb_pool, 2)
+
+        ::ActionSubscriber::Threadpool.pools.map do |_name, pool|
+          allow(pool).to receive(:busy_size).and_return(pool.pool_size)
+        end
+
+        expect(::ActionSubscriber::Threadpool).to_not be_ready
       end
     end
 
-    context "when the pool is not busy" do
+    context "when only one of the workers is full" do
       it "returns true" do
-        allow(::ActionSubscriber::Threadpool).to receive(:busy?).and_return false
-        expect(::ActionSubscriber::Threadpool.ready?).to eq(true)
+        pool = ::ActionSubscriber::Threadpool.new_pool(:some_other_dumb_pool, 2)
+        allow(pool).to receive(:busy_size).and_return(2)
+
+        expect(::ActionSubscriber::Threadpool).to be_ready
+      end
+    end
+
+    context "when there are idle workers" do
+      it "returns true" do
+        allow(::ActionSubscriber::Threadpool.pool).to receive(:busy_size).and_return(1)
+        expect(::ActionSubscriber::Threadpool).to be_ready
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -48,14 +48,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement