action_subscriber 1.2.3-java → 1.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c37aef199e1ebe53ec1c92d918a4aa5c02802552
-  data.tar.gz: 7a3b119a963a0d53b73494f2732cb986d3ab3ed2
+  metadata.gz: cf049755417490c97087d1592cf92c85d70c2885
+  data.tar.gz: 4f8cdc076da224e9db7b006aa52d3ac1a60affbc
 SHA512:
-  metadata.gz: 7eb7a487fc9decbf89fdd5ef4e1f4cf74feb8b53d226dbbed1f6d85b2c77518ec460581e6b7522128dd70aba6d8ceaccb7a8bb54de1d52543477a97728f24365
-  data.tar.gz: f1390c5905a605358687233b7951b9e64afd9b5c1c85bcbeb6ee2b82aa63763f24081980832ab9d52e42730a1347790816e5b1fc94efdad1060d7b688f101922
+  metadata.gz: 2cdf9bf646a393521a30ca5333e908448203e92d33e6ed197106cfb94789cc0028f57569028749fb359034f6b326084e86680ad42037b774f71ed18523c95046
+  data.tar.gz: 2b6a2c16f9679a357edf75463c3105cad974d8acfad96e5b3129bf3c3a09bc470b503fcb5ee88f12a84a572fd33f403584b033f10a780b245ce7b359ca813236

data/bin/action_subscriber

@@ -11,6 +11,7 @@ module ActionSubscriber
     class_option :mode
     class_option :host
     class_option :hosts
+    class_option :prefetch, :type => :numeric, :desc => "how many messages to hold in the local queue in subscribe mode"
     class_option :pop_interval, :type => :numeric, :desc => "how long to wait between asking for messages (in milliseconds)"
     class_option :port, :type => :numeric
     class_option :threadpool_size, :type => :numeric
@@ -35,27 +36,22 @@ module ActionSubscriber
         ::ActionSubscriber::Babou.auto_pop!
       when /subscribe/i then
         ::ActionSubscriber::Babou.start_subscribers
+      else
+        fail "ActionSubscriber.configuration.mode must be 'pop' or 'subscribe'.  Currently set to '#{::ActionSubscriber.configuration.mode}'"
       end
     end
   end
 
-  [:INT, :QUIT, :TERM].each do |signal|
-    trap(signal) do
-      puts "Stopping server..."
-      wait_loops = 0
+  if ::RUBY_PLATFORM == "java"
+    at_exit do
       ::ActionSubscriber::Babou.stop_server!
-
-      # Going to wait until the thread pool drains or we wait for 1000 seconds
-      # Only waiting for shut down in pop mode
-      if ::ActionSubscriber::Babou.pop?
-        while ::ActionSubscriber::Threadpool.pool.busy_size > 0 && wait_loops < 1000
-          Thread.pass
-          wait_loops = wait_loops + 1
-          sleep 1
-        end
+    end
+  else
+    [:INT, :QUIT, :TERM].each do |signal|
+      trap(signal) do
+        ::ActionSubscriber::Babou.stop_server!
+        exit 0
       end
-
-      exit 0
     end
   end
 end

data/lib/action_subscriber/babou.rb

@@ -18,7 +18,7 @@ module ActionSubscriber
       # default check interval to 100ms
       while true
         ::ActionSubscriber.auto_pop! unless shutting_down?
-        sleep sleep_time 
+        sleep sleep_time
         break if shutting_down?
       end
     end
@@ -74,12 +74,34 @@ module ActionSubscriber
       end
     end
 
-    def self.stop_server!
+    def self.shutting_down?
+      !!@shutting_down
+    end
+
+    def self.stop_receving_messages!
       @shutting_down = true
+      ::Thread.new do
+        ::ActionSubscriber::Base.inherited_classes.each do |subscriber|
+          subscriber.cancel_consumers!
+          puts "finished cancelling consumers"
+        end
+      end.join
     end
 
-    def self.shutting_down?
-      !!@shutting_down
+    def self.stop_server!
+      puts "Stopping server..."
+      wait_loops = 0
+      ::ActionSubscriber::Babou.stop_receving_messages!
+
+      # Going to wait until the thread pool drains or we wait for 1000 seconds
+      while ::ActionSubscriber::Threadpool.pool.busy_size > 0 && wait_loops < 1000
+        puts "waiting for threadpool to empty (#{::ActionSubscriber::Threadpool.pool.busy_size})"
+        Thread.pass
+        wait_loops = wait_loops + 1
+        sleep 1
+      end
+
+      puts "threadpool empty. Shutting down"
     end
 
     def self.subscribers_loaded?

data/lib/action_subscriber/bunny/subscriber.rb

@@ -1,6 +1,15 @@
 module ActionSubscriber
   module Bunny
     module Subscriber
+      def bunny_consumers
+        @bunny_consumers ||= []
+      end
+
+      def cancel_consumers!
+        puts "cancelling consumers for #{self}"
+        bunny_consumers.each(&:cancel)
+      end
+
       def auto_pop!
         # Because threadpools can be large we want to cap the number
         # of times we will pop each time we poll the broker
@@ -26,8 +35,10 @@ module ActionSubscriber
 
       def auto_subscribe!
         queues.each do |queue|
-          queue.channel.prefetch(::ActionSubscriber.config.prefetch) if acknowledge_messages?
-          queue.subscribe(queue_subscription_options) do |delivery_info, properties, encoded_payload|
+          channel = queue.channel
+          channel.prefetch(::ActionSubscriber.config.prefetch) if acknowledge_messages?
+          consumer = ::Bunny::Consumer.new(channel, queue, channel.generate_consumer_tag, !acknowledge_messages?)
+          consumer.on_delivery do |delivery_info, properties, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
               :channel => queue.channel,
@@ -40,6 +51,8 @@ module ActionSubscriber
             env = ::ActionSubscriber::Middleware::Env.new(self, encoded_payload, properties)
             enqueue_env(env)
           end
+          bunny_consumers << consumer
+          queue.subscribe_with(consumer)
         end
       end
 

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -1,6 +1,11 @@
 module ActionSubscriber
   module MarchHare
     module Subscriber
+      def cancel_consumers!
+        puts "cancelling consumers for #{self}"
+        march_hare_consumers.each(&:cancel)
+      end
+
       def auto_pop!
         # Because threadpools can be large we want to cap the number
         # of times we will pop each time we poll the broker
@@ -30,7 +35,7 @@ module ActionSubscriber
       def auto_subscribe!
         queues.each do |queue|
           queue.channel.prefetch = ::ActionSubscriber.config.prefetch if acknowledge_messages?
-          queue.subscribe(queue_subscription_options) do |header, encoded_payload|
+          consumer = queue.subscribe(queue_subscription_options) do |header, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
               :channel => queue.channel,
@@ -43,9 +48,15 @@ module ActionSubscriber
             env = ::ActionSubscriber::Middleware::Env.new(self, encoded_payload, properties)
             enqueue_env(env)
           end
+
+          march_hare_consumers << consumer
         end
       end
 
+      def march_hare_consumers
+        @march_hare_consumers ||= []
+      end
+
       private
 
       def enqueue_env(env)

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement