action_subscriber 4.4.0.pre1-java → 4.4.0.pre2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 559b74fdb667dfc0fd98f57a44691788c96129e029373af52ab69eecb8555169
-  data.tar.gz: f02254feb87e33e0c2078b17cc0adbe4b05ed5a9bff592a140fb31aa4aecd100
+  metadata.gz: 6fe3e9f8efec05473fbfdf80470c830571a3fbf443791c4a1ba2b734b3180056
+  data.tar.gz: fd5f12b1e85d98e6d22583a42bf9f7e23c3b534f00ee60e13814107b3c049c39
 SHA512:
-  metadata.gz: 5341a34d887f5b694b641f6d4a4d65478bcfe068a3de7c3b33ca47909934652aac593c41ff8cb8768f71662f2328f3f216f966185ad68c1d3c7297950f757821
-  data.tar.gz: 3ed74c8689ccb3768d3f6ee26e15cd0bb52d7bf8073be882fab0eb8e97c494985573f5c99529cf7933d3b9f7175085b27ccf5b180cc6134bd1d7db02921d0e39
+  metadata.gz: 3ae40be01a43d34bcfbf6c1529ade82c8a6bffd78780810a6a4b1a4218b10702247b3cbdae1cbbda78cbc9ca083d35f897e75efa9f95173ef80556991ad9599a
+  data.tar.gz: 7a1fcdd05959cc0bc1a2121f48ec5257f0d1826343fcbe21233fd23cadb2bb71588e6eed7570d61e3cad1aaaf76724ed358f3927fe04b9460c4156c30f2e7946

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.4.0.pre1"
+  VERSION = "4.4.0.pre2"
 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 4.4.0.pre1
+  version: 4.4.0.pre2
 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-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement