active_publisher 0.2.0.pre-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63df17dc2a58125dcc18b1cb9c7d20f0517da0ac
-  data.tar.gz: 9bd8dcd05da48bde7c14ff49a3dc10928ab609a6
+  metadata.gz: cf0ffccc8074e99fc31d1e5b0a0563e969b59492
+  data.tar.gz: b6b3d8c06b6338f902705f4304ce3e8c254b4dda
 SHA512:
-  metadata.gz: e8dbdc550e66d0d4182ed96333a03e37ab89466371bc3bc4634ff6d78e1f02e8daeafb5ed3b13f0bc3cb91d793af46ee6954ba2519e148122d8b2dde569a025c
-  data.tar.gz: d6a7965709096d9f9828afe0655982aaa5ddafa87b3256e44d6c815df4b6467af64bd0236d5f3c49edb9dd366f28dbb2e3011c1373ebd86a8ea9928bf8418bb6
+  metadata.gz: e9945b219ab735188e7eae81f0c2038a226f4840dab441e257ad27af6f872a8d40285f5341a0adb8c96d75bdaa058d0c69840eb64c7f731237c5517322035534
+  data.tar.gz: f410bf494ace9d0574e014cdc9bd278949851dc5c3cdf1909b90dee23caee3113cc98d7c6652a06764aa536e4cdb2c9f45fb6b2f1d7f1722fb9a051d1553df93

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"
 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
 platform: java
 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-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +145,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.7
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Aims to make publishing work across MRI and jRuby painless and add some nice features like automatially publishing lifecycle events for ActiveRecord models.