action_subscriber 4.4.0.pre1 → 4.4.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41394d2670a7fc6eb769238be15295938c349916
-  data.tar.gz: 360ab71b4df25808f40434cae94aeec5e031b274
+  metadata.gz: 3d01dff0781c64978615b89b36c41e7c20156bdf
+  data.tar.gz: c89cd86ed65822acd2d6c5f643a926b66c481ea6
 SHA512:
-  metadata.gz: c0a0a4c54d4e3aa0ea4070c30f8eff64d6c759c4a38f4fac9d7f802a0df9f0f496972485c1365349fcec72cbfd66f0674b67892ab9adea130748a2ece8a54a2b
-  data.tar.gz: f86b951f4d131f6956ebd4e76ecdadf29f441f7795c547fd6b16139dca68fee51013facac888f46cd30acf3db85d5909be7a6af488651ba6067c8c5504ac667b
+  metadata.gz: 695f6be2e0c311342d71b64ca6766bddc0c6dfe1d24deb75b0e57508b1895bd29c17548f270b4d086bb5cf198c999b541be76f89472a536d105bd7165b0471e0
+  data.tar.gz: 151cf8b4ef9e00933430574823770681a913c716cd63e16d5302cc50f300d3b769a884d0a322e596c4ea03f189aac779677e49c4406b01fd3204a261a6dc9fd5

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: ruby
 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
   name: activesupport