action_subscriber 1.2.3 → 1.3.0.rc0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b45c8935406a1754c056083bcd3d1e3c790b59bf
-  data.tar.gz: 72bf3d2d48e543ebca5f8b991dc354db7f589867
+  metadata.gz: 701ee841b7168f2d83ddc0767b410fb4d823fd44
+  data.tar.gz: bba2c85bfac1967c60c52435b0142ea40651c78a
 SHA512:
-  metadata.gz: 612f9f2a798a366f007ebaaa8125b72df6cf042c5631169b0af72350ecb950b2090c227078e88c94b7809c8ee2c21d7718af5585c2efbc21b7fa8216ce956c1c
-  data.tar.gz: ec8e589d774df7648aa86b96506038154106c852af43a480c9c60a858bd10726dcb66edc75b4da4565622bbeb96eb2e52f4f42351742bd9f2dfc5236af3246d7
+  metadata.gz: 19326dcda78b48629968f5ea1355634824bc8265b4877c9a21d67733beefccbe526f56113aadfb33c1802d6526ba4e132806ffe61599d2180746b9b8cb85c282
+  data.tar.gz: 62156cbacea3f77657ca7fa1ed649a1698f450f3c59d7d39866ee82603009b4796751aaede0647cf728091f83f8951093d312a2e1dc7008b9a03abf5b03a845d

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
@@ -39,23 +40,16 @@ module ActionSubscriber
     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/publisher.rb

@@ -25,12 +25,10 @@ module ActionSubscriber
       end
     end
 
-    def self.publishing_options(route, in_options = {})
-      options = {
-        :mandatory => false,
-        :persistent => false,
-        :routing_key => route,
-      }.merge(in_options)
+    def self.publishing_options(route, options = {})
+      options[:mandatory] = false unless options.key(:mandatory)
+      options[:persistent] = false unless options.key(:persistent)
+      options[:routing_key] = route
 
       if ::RUBY_PLATFORM == "java"
         java_options = {}

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.2.3"
+  VERSION = "1.3.0.rc0"
 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.rc0
 platform: ruby
 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-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8