action_subscriber 3.0.1-java → 3.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1399aac04de823cbbdd75e1dba0f8ae3c45232ed
-  data.tar.gz: 404f24d6a475c20942452178d77c6bfca7aad2a9
+  metadata.gz: d672ec64568bbf5c2a6907b57bd08f0e494367fe
+  data.tar.gz: 97146e4e381cad8acee06f1e96d47e36431d629f
 SHA512:
-  metadata.gz: 26ae9eedc5301772ed162f6db18e461c8e4a982a4ceb1bd2e59a8558f92de203a61445eeea2c78ef5601131351a2dd3a9efba5cb42fee4ad087d1620e1979393
-  data.tar.gz: ed762a8e65760130503ce53a5914f4e97e3a2613bcf59be3b09f0b65dae3cdfd64a14aaf39dbc2038f23396d329d13d73926ffac721206e6b516ead2e7be33b3
+  metadata.gz: ef116de1b2ea6fd6f7662005cf75b1efa73a71e929065d6e81368daa2726de218326dfc2db8da08aa35fdbceb8dba7f0a495e1287c9899a693dfc05c6c98f0dc
+  data.tar.gz: 5ab5b2d3f3daedcfebd25e030bb4059beaf59b64f9810290676cb4bcdf92361ac8c2cb8c9aca90dc559045000464b5e4b9df2f299a60b66eb941bb2a6b0d1baf

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: java
 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
   requirement: !ruby/object:Gem::Requirement