action_subscriber 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c70aa42049754f97b6f3e05f1fbdc743a728f7
-  data.tar.gz: e25c7a771fc3f230e194c284ed9f0535a0297bd7
+  metadata.gz: bf91f9b2566e00305d9bcc1bb873c550390f29ad
+  data.tar.gz: e523407919e74f5af41f321e4a2bc64d00bcaf59
 SHA512:
-  metadata.gz: d56c9dbbbf4db7fd0cec44d9a1afbdad0c5f3859b0be64dd800070d60f82aefc65af05cbe6346a252fc9d0aa76f37013ceae20d3f98c0478bf064eb5539c0d17
-  data.tar.gz: cb838fe0f9f956eea5dd7057ce14827b5f6de5daeab57a0391f84e0f74bea12f0515e7147ff5ed83e8f0f96c907667fe3434eb0f8635f9b2a191b70c939ca7a6
+  metadata.gz: f4d5e7566aabf121149d7d2eb453f8892872b268e018a07b6afbada975ce1dcd132307d54a35416077413f8b05174bdd0e0eae869e15a96f7cf4b2bcb8a1aab3
+  data.tar.gz: 13c8d270b87969981b92f9777cde802ad1acc9b85c5d68577105730746561f6bc72de1d055efd0956a9cb9e5482dcbb1bf2930a147078af29ead94c6163c463a

data/lib/action_subscriber.rb

@@ -101,6 +101,12 @@ module ActionSubscriber
     route_set.cancel_consumers!
   end
 
+  def self.wait_for_threadpools_to_finish_with_timeout(timeout)
+    puts "waiting for threadpools to empty (maximum wait of #{::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown}sec)"
+    ::ActionSubscriber::Threadpool.wait_to_finish_with_timeout(timeout)
+    route_set.wait_to_finish_with_timeout(timeout)
+  end
+
   # Execution is delayed until after app loads when used with bin/action_subscriber
   require "action_subscriber/railtie" if defined?(Rails)
   ::ActiveSupport.run_load_hooks(:action_subscriber, Base)

data/lib/action_subscriber/babou.rb

@@ -70,20 +70,12 @@ module ActionSubscriber
     def self.stop_server!
       # this method is called from within a TRAP context so we can't use the logger
       puts "Stopping server..."
-      wait_loops = 0
       ::ActionSubscriber::Babou.stop_receving_messages!
-
-      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
-      end
-
-      puts "threadpool empty. Shutting down"
+      ::ActionSubscriber.wait_for_threadpools_to_finish_with_timeout(::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown)
+      puts "Shutting down"
+      ::Thread.new do
+        ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
+      end.join
     end
   end
 end

data/lib/action_subscriber/bunny/subscriber.rb

@@ -73,6 +73,15 @@ module ActionSubscriber
         end
       end
 
+      def wait_to_finish_with_timeout(timeout)
+        puts <<-MSG
+          Currently bunny doesn't have any sort of a graceful shutdown or
+          the ability to check on the status of its ConsumerWorkPool objects.
+          For now we just wait for #{timeout}sec to let the worker pools drain.
+        MSG
+        sleep(timeout)
+      end
+
       private
 
       def enqueue_env(threadpool, env)

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -76,6 +76,26 @@ module ActionSubscriber
         @march_hare_consumers ||= []
       end
 
+      def wait_to_finish_with_timeout(timeout)
+        wait_loops = 0
+        loop do
+          wait_loops = wait_loops + 1
+          any_threadpools_busy = false
+          ::ActionSubscriber::RabbitConnection.connection_threadpools.each do |name, executor|
+            next if executor.get_active_count <= 0
+            puts "  -- Connection #{name} (remaining: #{executor.get_active_count})"
+            any_threadpools_busy = true
+          end
+          if !any_threadpools_busy
+            puts "Connection threadpools empty"
+            break
+          end
+          break if wait_loops >= timeout
+          Thread.pass
+          sleep 1
+        end
+      end
+
       private
 
       def enqueue_env(threadpool, env)

data/lib/action_subscriber/rabbit_connection.rb

@@ -5,6 +5,16 @@ module ActionSubscriber
     SUBSCRIBER_CONNECTION_MUTEX = ::Mutex.new
     NETWORK_RECOVERY_INTERVAL = 1.freeze
 
+    def self.connection_threadpools
+      if ::RUBY_PLATFORM == "java"
+        subscriber_connections.each_with_object({}) do |(name, connection), hash|
+          hash[name] = connection.instance_variable_get("@executor")
+        end
+      else
+        [] # TODO can I get a hold of the thredpool that bunny uses?
+      end
+    end
+
     def self.setup_connection(name, settings)
       SUBSCRIBER_CONNECTION_MUTEX.synchronize do
         fail ArgumentError, "a #{name} connection already exists" if subscriber_connections[name]

data/lib/action_subscriber/threadpool.rb

@@ -38,5 +38,25 @@ module ActionSubscriber
         total_ready + [0, pool.pool_size - pool.busy_size].max
       end
     end
+
+    def self.wait_to_finish_with_timeout(timeout)
+      wait_loops = 0
+      loop do
+        wait_loops = wait_loops + 1
+        any_threadpools_busy = false
+        pools.each do |name, pool|
+          next if pool.busy_size <= 0
+          puts "  -- #{name} (remaining: #{pool.busy_size})"
+          any_threadpools_busy = true
+        end
+        if !any_threadpools_busy
+          puts "  -- Lifeguard threadpools empty"
+          break
+        end
+        break if wait_loops >= timeout
+        Thread.pass
+        sleep 1
+      end
+    end
   end
 end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport