active_publisher 0.2.0.pre → 0.2.1.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a932872062730d27d6181d03ebed2b1f4187970a
-  data.tar.gz: dfed367061588fbe66f852dd5b77d90ef1264ffb
+  metadata.gz: 776896ecf47853a70286c608f9e8201d1b33f2da
+  data.tar.gz: 5feed515e2207aaa5503582ebd4aa81d69970591
 SHA512:
-  metadata.gz: cd2528f6c2fe2cf243b14b90891f92b884bacb0073e5261d502ae09787f7f3bba338e1c08ac5c5197a3f6c77079bf75aff2a3115fefa619b74c09173a8c4f094
-  data.tar.gz: 3c9db3e6aeff82716388de4cbf8230381cc6d9c8cdf3e2ea70b08af5bc99201a84f92005f742a2f9e6ef006a495001d7d08c86cfddf24244ea025dae9b5d5cd5
+  metadata.gz: 6b4c8139224c0f17a8e3a11ea45784f02b2c55dd1c8eb1b86d330c44fc5884306c96545aa64ab44a25d41b9b318be735ba2ecd4b1dd5537cc561d7a52a60347b
+  data.tar.gz: 367df378599133b6a1e644fb445a71b22cbe9fef84b95a8fb7cb10c720c6e473e26b1d87dbbbb840e500ed6b9ee19047d7a761dd62e93e186bd25f22901ca5ab

data/lib/active_publisher/async/in_memory_adapter/async_queue.rb

@@ -32,7 +32,10 @@ module ActivePublisher
         end
 
         def size
-          queue.size
+          # Requests might be in flight (out of the queue, but not yet published), so taking the max should be
+          # good enough to make sure we're honest about the actual queue size.
+          return queue.size if consumer.nil?
+          [queue.size, consumer.sampled_queue_size].max
         end
 
         private
@@ -42,9 +45,6 @@ module ActivePublisher
           @supervisor = ::Thread.new do
             loop do
               unless consumer.alive?
-                # We might need to requeue the last messages popped
-                current_consumer_messages = consumer.current_messages
-                queue.concat(current_consumer_messages) unless current_consumer_messages.empty?
                 consumer.kill
                 @consumer = ::ActivePublisher::Async::InMemoryAdapter::ConsumerThread.new(queue)
               end

data/lib/active_publisher/async/in_memory_adapter/consumer_thread.rb

@@ -2,7 +2,7 @@ module ActivePublisher
   module Async
     module InMemoryAdapter
       class ConsumerThread
-        attr_reader :current_messages, :thread, :queue
+        attr_reader :thread, :queue, :sampled_queue_size
 
         if ::RUBY_PLATFORM == "java"
           NETWORK_ERRORS = [::MarchHare::Exception, ::Java::ComRabbitmqClient::AlreadyClosedException, ::Java::JavaIo::IOException].freeze
@@ -11,8 +11,8 @@ module ActivePublisher
         end
 
         def initialize(listen_queue)
-          @current_messages = []
           @queue = listen_queue
+          @sampled_queue_size = queue.size
           start_thread
         end
 
@@ -39,43 +39,36 @@ module ActivePublisher
           return if alive?
           @thread = ::Thread.new do
             loop do
-              # Write "current_messages" so we can requeue should something happen to the consumer.
-              @current_messages.concat(queue.pop_up_to(20))
+              # Sample the queue size so we don't shutdown when messages are in flight.
+              @sampled_queue_size = queue.size
+              current_messages = queue.pop_up_to(20)
 
               begin
                 # Only open a single connection for each group of messages to an exchange
-                messages_to_retry = []
-                @current_messages.group_by(&:exchange_name).each do |exchange_name, messages|
+                current_messages.group_by(&:exchange_name).each do |exchange_name, messages|
                   begin
+                    current_messages -= messages
                     ::ActivePublisher.publish_all(exchange_name, messages)
                   ensure
-                    messages_to_retry.concat(messages)
+                    current_messages.concat(messages)
                   end
                 end
-
-                # Reset
-                @current_messages = []
               rescue *NETWORK_ERRORS
                 # Sleep because connection is down
                 await_network_reconnect
-                @current_messages.concat(messages_to_retry)
 
                 # Requeue and try again.
-                queue.concat(@current_messages) unless @current_messages.empty?
+                queue.concat(current_messages)
               rescue => unknown_error
-                @current_messages.concat(messages_to_retry)
-                @current_messages.each do |message|
+                current_messages.each do |message|
                   # Degrade to single message publish ... or at least attempt to
                   begin
                     ::ActivePublisher.publish(message.route, message.payload, message.exchange_name, message.options)
-                  rescue => error
+                  rescue
                     ::ActivePublisher.configuration.error_handler.call(unknown_error, {:route => message.route, :payload => message.payload, :exchange_name => message.exchange_name, :options => message.options})
                   end
                 end
 
-                # Do not requeue the message because something else horrible happened.
-                @current_messages = []
-
                 # TODO: Find a way to bubble this out of the thread for logging purposes.
                 # Reraise the error out of the publisher loop. The Supervisor will restart the consumer.
                 raise unknown_error

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "0.2.0.pre"
+  VERSION = "0.2.1-pre1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
+  version: 0.2.1.pre.pre1
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny