active_publisher 0.3.0-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68de1406c1a8d12f48d204706891b85f92f8f38
-  data.tar.gz: 7f40ae37793a0e3cd116a8697c0d409e22b54939
+  metadata.gz: 38225a42d598f22ae2b41480cd58fb93463789ed
+  data.tar.gz: b1788dee289e163797f8f992158beeb9462ea758
 SHA512:
-  metadata.gz: e1d9238b86529974e3bbc6793e557b1066b672e8d158039e1b38aa763eb1d1331bacfef20664cb896b91d467a1823622473402cad2087087411f383ec7db7433
-  data.tar.gz: c0bb868985c0e0aaa1fb90551397700688fa06423649e7285606e9c6741db6a87d294cdcaa55fbe502d63406c0f18dbaba0ee16602830932e290e80e5bf6ef36
+  metadata.gz: a115986e6d53365a4da81b283f08dbab53f581c83deb0aad5748951f341e2f4f3e468d101c68cd10ef2c5b39a3e7c3db43c8290a603a21a665b4f298afa28a24
+  data.tar.gz: 73e551aad3e999e233d79dd6846116b3d1dcb21b258f91cc3a4b2220e51437a9e15d46f4fbf2ef019f4599c28831c30b76307e3878e5d01075141105607e6fd7

data/.travis.yml

@@ -1,15 +1,11 @@
 language: ruby
 rvm:
- - 2.0
- - 2.1
  - 2.2
+ - 2.3
+ - 2.4
  - jruby-1.7
- - jruby-9.1.0.0
- - jruby-head
+ - jruby-9.1.12.0
 services:
  - rabbitmq
 sudo: false
 cache: bundler
-matrix:
-  allow_failures:
-    - rvm: jruby-head

data/lib/active_publisher.rb

@@ -16,6 +16,7 @@ require "active_publisher/connection"
 module ActivePublisher
   class UnknownMessageClassError < StandardError; end
   class ExchangeMismatchError < StandardError; end
+  class FailedPublisherConfirms < StandardError; end
 
   def self.configuration
     @configuration ||= ::ActivePublisher::Configuration.new
@@ -62,7 +63,7 @@ module ActivePublisher
       :persistent => false,
       :routing_key => route,
     }.merge(in_options)
-    
+
     if ::RUBY_PLATFORM == "java"
       java_options = {}
       java_options[:mandatory]   = options.delete(:mandatory)

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

@@ -35,20 +35,28 @@ module ActivePublisher
           end
         end
 
+        def make_channel
+          channel = ::ActivePublisher::Connection.connection.create_channel
+          channel.confirm_select if ::ActivePublisher.configuration.publisher_confirms
+          channel
+        end
+
         def start_thread
           return if alive?
           @thread = ::Thread.new do
             loop do
               # 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)
+              current_messages = queue.pop_up_to(50)
 
               begin
+                @channel ||= make_channel
+
                 # Only open a single connection for each group of messages to an exchange
                 current_messages.group_by(&:exchange_name).each do |exchange_name, messages|
                   begin
                     current_messages -= messages
-                    ::ActivePublisher.publish_all(exchange_name, messages)
+                    publish_all(@channel, exchange_name, messages)
                   ensure
                     current_messages.concat(messages)
                   end
@@ -76,6 +84,40 @@ module ActivePublisher
             end
           end
         end
+
+        def publish_all(channel, exchange_name, messages)
+          exchange = channel.topic(exchange_name)
+          potentially_retry = []
+          loop do
+            break if messages.empty?
+            message = messages.shift
+
+            fail ActivePublisher::UnknownMessageClassError, "bulk publish messages must be ActivePublisher::Message" unless message.is_a?(ActivePublisher::Message)
+            fail ActivePublisher::ExchangeMismatchError, "bulk publish messages must match publish_all exchange_name" if message.exchange_name != exchange_name
+
+            begin
+              options = ::ActivePublisher.publishing_options(message.route, message.options || {})
+              exchange.publish(message.payload, options)
+              potentially_retry << message
+            rescue
+              messages << message
+              raise
+            end
+          end
+          wait_for_confirms(channel, messages, potentially_retry)
+        end
+
+        def wait_for_confirms(channel, messages, potentially_retry)
+          return true unless channel.using_publisher_confirms?
+          if channel.method(:wait_for_confirms).arity > 0
+            channel.wait_for_confirms(::ActivePublisher.configuration.publisher_confirms_timeout)
+          else
+            channel.wait_for_confirms
+          end
+        rescue
+          messages.concat(potentially_retry)
+          raise
+        end
       end
     end
   end

data/lib/active_publisher/configuration.rb

@@ -9,6 +9,7 @@ module ActivePublisher
                   :password,
                   :port,
                   :publisher_confirms,
+                  :publisher_confirms_timeout,
                   :seconds_to_wait_for_graceful_shutdown,
                   :timeout,
                   :tls,
@@ -33,6 +34,7 @@ module ActivePublisher
       :password => "guest",
       :port => 5672,
       :publisher_confirms => false,
+      :publisher_confirms_timeout => 5_000, #specified as a number of milliseconds
       :seconds_to_wait_for_graceful_shutdown => 30,
       :timeout => 1,
       :tls => false,

data/lib/active_publisher/version.rb

@@ -1,3 +1,3 @@
 module ActivePublisher
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_publisher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 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.