action_subscriber 1.5.1.pre0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c849d8d45a4a0e167d37823d02d7c5b5be82e501
-  data.tar.gz: 9547cf8706d8af50904b4a4f87498270916d1110
+  metadata.gz: d313afcc25cfffc3977ac51fd000454a5203a302
+  data.tar.gz: 6e6b1cef5a1431f8d8b3d1e2f4dc6e11797f21c7
 SHA512:
-  metadata.gz: 839968227dcf5b789adf36b489e0d4feb1950399b6657101a2d1a43f6614a895e5d1be30e8c57e4ce35da1a5ea45296ce3efdbb7e9028413a6cc748bbcef8d73
-  data.tar.gz: 4d928ed945e5dacb26cf3ebf38ff7dd27b3b9603e0722498bb1cfe2d0b8e0c65af1d90cdaabf0b1ad7f9d946b496f5e1cf15cdae263526941246ab2e15df8372
+  metadata.gz: 83dba20046583695e060cba67c22cb85effe54a649973d9d08716a25964497214a1496e8f0f7f23f9ed805f999c18ba212dfa1d3551201032eff06f03a9c5d4e
+  data.tar.gz: 54e4e53b941c3d2f8f7e86e79d24cf0d53bee320161a812f9bf7e501e392277ee900270e3da495c2ab914d288e54abfd086c5383903ba85dfe48631b77ad11e6

data/bin/action_subscriber

@@ -65,9 +65,7 @@ trap(:USR2) {
   Action Subscriber Stats
     Pool Size: #{ ::ActionSubscriber.config.threadpool_size }
     Ready Size: #{ ::ActionSubscriber::Threadpool.ready_size }
-    Jobs Waiting in Queue: #{ ::ActionSubscriber::Threadpool.number_of_jobs_queued }
   CONFIG
-  ActionSubscriber::Threadpool.print_threadpool_stackraces
 }
 
 ::ActionSubscriber::CLI.start(ARGV)

data/lib/action_subscriber/bunny/subscriber.rb

@@ -37,7 +37,7 @@ module ActionSubscriber
       def auto_subscribe!
         queues.each do |route, queue|
           channel = queue.channel
-          channel.prefetch(::ActionSubscriber.config.prefetch) if route.acknowledgements?
+          channel.prefetch(route.prefetch) if route.acknowledgements?
           consumer = ::Bunny::Consumer.new(channel, queue, channel.generate_consumer_tag, !route.acknowledgements?)
           consumer.on_delivery do |delivery_info, properties, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -35,7 +35,7 @@ module ActionSubscriber
 
       def auto_subscribe!
         queues.each do |route,queue|
-          queue.channel.prefetch = ::ActionSubscriber.config.prefetch if route.acknowledgements?
+          queue.channel.prefetch = route.prefetch if route.acknowledgements?
           consumer = queue.subscribe(route.queue_subscription_options) do |metadata, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {

data/lib/action_subscriber/route.rb

@@ -3,6 +3,7 @@ module ActionSubscriber
     attr_reader :acknowledgements,
                 :action,
                 :exchange,
+                :prefetch,
                 :routing_key,
                 :subscriber,
                 :queue
@@ -11,6 +12,7 @@ module ActionSubscriber
       @acknowledgements = attributes.fetch(:acknowledgements)
       @action = attributes.fetch(:action)
       @exchange = attributes.fetch(:exchange).to_s
+      @prefetch = attributes.fetch(:prefetch) { ::ActionSubscriber.config.prefetch }
       @routing_key = attributes.fetch(:routing_key)
       @subscriber = attributes.fetch(:subscriber)
       @queue = attributes.fetch(:queue)

data/lib/action_subscriber/threadpool.rb

@@ -7,10 +7,6 @@ module ActionSubscriber
       (pool.pool_size == pool.busy_size)
     end
 
-    def self.number_of_jobs_queued
-      pool.instance_variable_get('@queued_jobs').size
-    end
-
     def self.perform_async(*args)
       self.pool.async.perform(*args)
     end
@@ -21,16 +17,6 @@ module ActionSubscriber
       )
     end
 
-    def self.print_threadpool_stackraces
-      $stderr.puts "ActionSubscriber :: Threadpool stacktraces\n"
-      pool.instance_variable_get('@busy_threads').each do |thread|
-        $stderr.puts <<-THREAD_TRACE
-          #{thread.inspect}:
-          #{thread.backtrace.try(:join, $INPUT_RECORD_SEPARATOR)}"
-        THREAD_TRACE
-      end
-    end
-
     def self.ready?
       !busy?
     end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.5.1.pre0"
+  VERSION = "1.6.0"
 end

data/spec/lib/action_subscriber/router_spec.rb

@@ -53,6 +53,16 @@ describe ActionSubscriber::Router do
     expect(routes.first.queue).to eq("alice.fake.foo")
   end
 
+  it "can specify a prefetch value" do
+    routes = described_class.draw_routes do
+      route FakeSubscriber, :foo, :acknowledgements => true, :prefetch => 10
+      route FakeSubscriber, :bar, :acknowledgements => true
+    end
+
+    expect(routes.first.prefetch).to eq(10)
+    expect(routes.last.prefetch).to eq(::ActionSubscriber.config.prefetch)
+  end
+
   it "can specify the queue" do
     routes = described_class.draw_routes do
       route FakeSubscriber, :foo, :publisher => "russell", :queue => "i-am-your-father"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.5.1.pre0
+  version: 1.6.0
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -262,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8