emque-producing 1.1.2 → 1.1.3

data/lib/emque/producing/message/message.rb

@@ -133,7 +133,7 @@ module Emque
           log "valid...", true
           if Emque::Producing.configuration.publish_messages
             message = process_middleware(to_json)
-            sent = publisher.publish(topic, message_type, message, partition_key)
+            sent = publisher.publish(topic, message_type, message, partition_key, raise_on_failure?)
             log "sent #{sent}"
             raise MessagesNotSentError.new unless sent
           end

data/lib/emque/producing/publisher/rabbitmq.rb

@@ -13,22 +13,19 @@ module Emque
           .new(Emque::Producing.configuration.rabbitmq_options[:url])
           .tap { |conn| conn.start }
 
+        CONFIRM_CHANNEL_POOL = Queue.new.tap {
+          |queue| queue << CONN.create_channel
+        }
         CHANNEL_POOL = Queue.new.tap { |queue| queue << CONN.create_channel }
 
-        def publish(topic, message_type, message, key = nil)
-          begin
-            ch = CHANNEL_POOL.pop(true)
-          rescue ThreadError
-            ch = CONN.create_channel
-          end
+        def publish(topic, message_type, message, key = nil, raise_on_failure)
+          ch = get_channel(raise_on_failure)
 
           ch.open if ch.closed?
           begin
             exchange = ch.fanout(topic, :durable => true, :auto_delete => false)
 
-            # Assumes all messages are mandatory in order to let callers know if
-            # the message was not sent. Uses publisher confirms to wait.
-            ch.confirm_select
+            ch.confirm_select if raise_on_failure
             sent = true
 
             exchange.on_return do |return_info, properties, content|
@@ -42,19 +39,38 @@ module Emque
               :persistent => true,
               :type => message_type,
               :app_id => Emque::Producing.configuration.app_name,
-              :content_type => "application/json")
+              :content_type => "application/json"
+            )
 
-            success = ch.wait_for_confirms
-            unless success
-              Emque::Producing.logger.warn("RabbitMQ Publisher: message was nacked")
-              ch.nacked_set.each do |n|
-                Emque::Producing.logger.warn("message id: #{n}")
+            if raise_on_failure
+              success = ch.wait_for_confirms
+              unless success
+                Emque::Producing.logger.warn("RabbitMQ Publisher: message was nacked")
+                ch.nacked_set.each do |n|
+                  Emque::Producing.logger.warn("message id: #{n}")
+                end
               end
             end
 
             return sent
           ensure
-            CHANNEL_POOL << ch unless ch.nil?
+            if raise_on_failure
+              CONFIRM_CHANNEL_POOL << ch unless ch.nil?
+            else
+              CHANNEL_POOL << ch unless ch.nil?
+            end
+          end
+        end
+
+        def get_channel(raise_on_failure)
+          begin
+            if raise_on_failure
+              ch = CONFIRM_CHANNEL_POOL.pop(true)
+            else
+              ch = CHANNEL_POOL.pop(true)
+            end
+          rescue ThreadError
+            ch = CONN.create_channel
           end
         end
       end

data/lib/emque/producing/version.rb

@@ -1,5 +1,5 @@
 module Emque
   module Producing
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

data/spec/producing/message/message_spec.rb

@@ -292,6 +292,10 @@ describe Emque::Producing::Message do
       let(:message) { TestMessageDontRaiseOnFailure.new() }
       let(:publisher) { TestPublisher.new }
 
+      it "sets raise_on_failure to false" do
+        expect(message.raise_on_failure?).to be(false)
+      end
+
       it "catches exceptions from publisher" do
         allow(Emque::Producing).to receive(:publisher) { raise TestPublisher::InvalidMessageError }
 
@@ -321,13 +325,16 @@ describe Emque::Producing::Message do
 
         expect{message.publish(publisher)}.to raise_error(TestMessageDontRaiseOnFailure::DontIgnoreThisError)
       end
-
     end
 
     describe "when true" do
       let(:message) { TestMessage.new(:test_id => 1) }
       let(:publisher) { TestPublisher.new }
 
+      it "sets raise_on_failure to true" do
+        expect(message.raise_on_failure?).to be(true)
+      end
+
       it "doesn't catch exceptions from publisher" do
         allow(Emque::Producing).to receive(:publisher) { raise TestPublisher::InvalidMessageError }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emque-producing
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj