action_subscriber 4.3.0-java → 4.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3f622ce2e3012238b0c9fbf913521c3a0fca8c4e
-  data.tar.gz: 6cd98fc4462432f31f3f8b831cf67b56f736ebeb
+SHA256:
+  metadata.gz: 8ab791cc3202a714a5fc9772e692e6e8f994c03a7f1b7bf7a3ed3f1c0409a2ce
+  data.tar.gz: 86b53b5040ef683b689c230cefb391c82291ff7304b0b6aa0f28ff87f85ecc36
 SHA512:
-  metadata.gz: 4d183e49799bb5efea2cc2b154deba43a2d315f4274e6d184a999be7de7d6f73b18deb03860f5ebec739127b85a10e411a56e18d87f9bc51584acdc17cdfce0f
-  data.tar.gz: 076de98f4f5886898400ee4a2793532ba531714f92b0604cc26c96940c89f65b0648073c77253b5000b2f3435a05ab8a09d60491a09d6039de47690778d62546
+  metadata.gz: 1722543d8a584ce8c652b1d670901e9afbfceb4ee52d75bda9b7a7c5f2e6b952232248ad2600740621966efe21a6fccd470398e7f7640964436a32ea198d0410
+  data.tar.gz: 0b7f54b8bf1e633971da938e0d0cf189bf3b4e98907b5b81bc182dd5c0fe2615f067a8cc98a46dd4445591f836f211d93711916cdb8e4e061e9e4d4e759600f4

data/bin/action_subscriber

@@ -40,18 +40,11 @@ module ActionSubscriber
       ::ActionSubscriber::Babou.start_subscribers
     end
   end
+end
 
-  if ::RUBY_PLATFORM == "java"
-    at_exit do
-      ::ActionSubscriber::Babou.stop_server!
-    end
-  else
-    [:INT, :QUIT, :TERM].each do |signal|
-      trap(signal) do
-        ::ActionSubscriber::Babou.stop_server!
-        exit 0
-      end
-    end
+[:INT, :QUIT, :TERM].each do |signal|
+  trap(signal) do
+    ::ActionSubscriber::Babou.stop_server!
   end
 end
 

data/lib/action_subscriber.rb

@@ -71,7 +71,7 @@ module ActionSubscriber
   def self.stop_subscribers!(timeout = nil)
     timeout ||= ::ActionSubscriber.configuration.seconds_to_wait_for_graceful_shutdown
     route_set.cancel_consumers!
-    puts "waiting for threadpools to empty (maximum wait of #{timeout}sec)"
+    logger.info "waiting for threadpools to empty (maximum wait of #{timeout}sec)"
     route_set.wait_to_finish_with_timeout(timeout)
   end
 

data/lib/action_subscriber/babou.rb

@@ -15,6 +15,12 @@ module ActionSubscriber
         sleep 1.0 #just hang around waiting for messages
         break if shutting_down?
       end
+
+      logger.info "Stopping subscribers..."
+      ::ActionSubscriber.stop_subscribers!
+      logger.info "Shutting down"
+      ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
+      logger.info "Shutdown complete"
     end
 
     def self.logger
@@ -32,14 +38,7 @@ module ActionSubscriber
     end
 
     def self.stop_server!
-      # this method is called from within a TRAP context so we can't use the logger
       @shutting_down = true
-      ::Thread.new do
-        puts "Stopping subscribers..."
-        ::ActionSubscriber.stop_subscribers!
-        puts "Shutting down"
-        ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
-      end.join
     end
   end
 end

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -84,11 +84,11 @@ module ActionSubscriber
           any_threadpools_busy = false
           ::ActionSubscriber::RabbitConnection.connection_threadpools.each do |name, executor|
             next if executor.get_active_count <= 0
-            puts "  -- Connection #{name} (active: #{executor.get_active_count}, queued: #{executor.get_queue.size})"
+            logger.info "  -- Connection #{name} (active: #{executor.get_active_count}, queued: #{executor.get_queue.size})"
             any_threadpools_busy = true
           end
           if !any_threadpools_busy
-            puts "Connection threadpools empty"
+            logger.info "Connection threadpools empty"
             break
           end
           break if wait_loops >= timeout

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "4.3.0"
+  VERSION = "4.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from