msgr 0.11.0.rc1 → 0.11.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d96720fd1623cf5da1206a59f5d3bdd212cc051
-  data.tar.gz: 78025a148dd7f43c406f0a9aeca9d8a7726b3758
+  metadata.gz: 1702792de09a7bdb79ac0cc05e7cdc89e00ed8ed
+  data.tar.gz: 138ef85e022e7346efc4e2960002c0b2f8bc3a62
 SHA512:
-  metadata.gz: d3eb940e3e0e9b8db4c0ee314fd5d162fd4c07948b5b7692ef6e7f7949eb26297352f2823b0b539aafefa214d1d3e11ec00ca7752c31eee2392db7dd69802e66
-  data.tar.gz: 5af7a695ac861ba16399acd1f0f3735209dbc051307a66b281ef154540ae020e4e107a3e31a292d53feb4fd32bdf09f2f79d4488261a032f3bfc9367d8f1dddd
+  metadata.gz: 3683e6cdcf37754eb553ceaa6db9c40c0837dd48b2702a619a6639a76a4ecc72d6f044bfa2c8cf26e856d1a47d55aa1471bd8896390fdcf9930ddf1358de4c29
+  data.tar.gz: fc5e451ecd1b6f983ea41f5b6ba06970186183f5efc178e17a071edb50f7346059f80c73d660e5eacd8edfb9e0af206b9b192b659eed26c5ae96b11aff815cf9

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.11.rc2
+
+* Add nack for messages when an error is rescued by dispatcher
+
+## 0.11.rc1
+
+* Add pool_class config to override pool classes used by dispatcher
+
+## 0.4 - 0.10
+
+* Some lost history due to several crises
+
 ## 0.4.1
 
 * Fix bug with empty routes on client start

data/lib/msgr/connection.rb

@@ -103,6 +103,11 @@ module Msgr
       log(:debug) { "Acked message: #{delivery_tag}" }
     end
 
+    def nack(delivery_tag)
+      channel.nack delivery_tag, false, true
+      log(:debug) { "Nacked message: #{delivery_tag}" }
+    end
+
     def reject(delivery_tag, requeue = true)
       channel.reject delivery_tag, requeue
       log(:debug) { "Rejected message: #{delivery_tag}" }

data/lib/msgr/dispatcher.rb

@@ -34,6 +34,8 @@ module Msgr
       # Acknowledge message unless it is already acknowledged.
       message.ack unless message.acked?
     rescue => error
+      message.nack unless message.acked?
+
       log(:error) do
         "Dispatcher error: #{error.class.name}: #{error}\n" +
             error.backtrace.join("\n")

data/lib/msgr/message.rb

@@ -37,7 +37,19 @@ module Msgr
     def ack
       unless acked?
         @acked = true
-        @connection.ack(delivery_info.delivery_tag)
+        @connection.ack delivery_info.delivery_tag
+      end
+    end
+
+    # Send negative message acknowledge to broker unless
+    # message is  already acknowledged.
+    #
+    # @api public
+    #
+    def nack
+      unless acked?
+        @acked = true
+        @connection.nack delivery_info.delivery_tag
       end
     end
   end

data/lib/msgr/version.rb

@@ -3,7 +3,7 @@ module Msgr
     MAJOR = 0
     MINOR = 11
     PATCH = 0
-    STAGE = 'rc1'
+    STAGE = 'rc2'
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 
     def self.to_s; STRING end

data/spec/integration/msgr/dispatcher_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-class TestConsumer < Msgr::Consumer
+class DispatcherTestConsumer < Msgr::Consumer
   def index
     puts "<<< #{payload}"
   end
@@ -8,7 +8,7 @@ end
 
 describe Msgr::Dispatcher do
   let(:dispatcher) { described_class.new max: 1 }
-  let(:consumer) { 'TestConsumer' }
+  let(:consumer) { 'DispatcherTestConsumer' }
   let(:route) do
     double(:route).tap do |t|
       allow(t).to receive(:consumer).and_return consumer
@@ -36,7 +36,7 @@ describe Msgr::Dispatcher do
 
   before do
     expect_any_instance_of(::Concurrent::CachedThreadPool).to receive(:post).and_return { |m, &block| block.call m}
-    expect_any_instance_of(TestConsumer).to receive(:index)
+    expect_any_instance_of(DispatcherTestConsumer).to receive(:index)
   end
 
   it 'should consume message' do

data/spec/msgr/msgr_spec.rb

@@ -1,8 +1,16 @@
 require 'spec_helper'
 
-class TestConsumer < Msgr::Consumer
+class Receiver
+end
+
+#
+class MsgrTestConsumer < Msgr::Consumer
   def index
-    puts "<<< #{payload}"
+    Receiver.index
+  end
+
+  def error
+    Receiver.error
   end
 end
 
@@ -12,11 +20,13 @@ describe Msgr do
     Msgr.logger.level = Logger::Severity::DEBUG if Msgr.logger
   end
 
-  let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(32) }
+  let(:queue) { Queue.new }
+  let(:client) { Msgr::Client.new size: 1, prefix: SecureRandom.hex(2) }
 
   before do
     client.routes.configure do
-      route '#', to: 'test#index'
+      route 'test.index', to: 'msgr_test#index'
+      route 'test.error', to: 'msgr_test#error'
     end
 
     client.start
@@ -27,10 +37,19 @@ describe Msgr do
   end
 
   it 'should dispatch published methods to consumer' do
-    expect_any_instance_of(TestConsumer).to receive(:index).seconds.and_call_original
+    expect(Receiver).to receive(:index) { queue << :end }
+
+    client.publish 'Payload', to: 'test.index'
+
+    Timeout::timeout(4) { queue.pop }
+  end
+
+  it 'should redelivery failed messages' do
+    expect(Receiver).to receive(:error).ordered.and_raise RuntimeError
+    expect(Receiver).to receive(:error).ordered { queue << :end }
 
-    client.publish 'Payload', to: 'routing.key'
+    client.publish 'Payload', to: 'test.error'
 
-    sleep 4
+    Timeout::timeout(4) { queue.pop }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgr
 version: !ruby/object:Gem::Version
-  version: 0.11.0.rc1
+  version: 0.11.0.rc2
 platform: ruby
 authors:
 - Jan Graichen