action_subscriber 1.5.1.pre0-java → 1.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25c60d1bd97b9955dfe8d1267a3085fb7703ba6
-  data.tar.gz: ee3cdf9a50ba2e0f31a901b8701b8f2e7aea3374
+  metadata.gz: 959abaf83dc8db177e4f6ce6dab0c7f969602e8a
+  data.tar.gz: 852063b2ecdabd40b76c169a690a172ade234499
 SHA512:
-  metadata.gz: 003f0d7bc544b9f868259b667da3a58b9594db2ee9f9925971f15f50a2131765e1200af1ba0a0ef52dfa4d07e8d41d9c2afe30760e6bea37307109c8c60cd8b6
-  data.tar.gz: dc1c369f198565cd31a927d7ec6e961047d961fd2f3aaa8005e6fce58c62f2b55efab5b70464e30573342c26dbcfcff8312c1cc108cca39674d49a0e65338af6
+  metadata.gz: de2df3cc869aaac13b7a44e5949a16f7681659556ae5af9ca2619f8885d8ae2c9c9cc847381fae131ad896f8f914168be628440ece7c3d325323dfd45164e646
+  data.tar.gz: 978f1bc25f6a1db1c516ccb12eca8a8455fb0a7912afe017ce667b52efd8459dc28e5070f3dc06690e9b0c0061d03e7ff966949ebef1fa36229534b2e2c94da7

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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -261,9 +261,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.5.0