action_subscriber 1.3.0.rc0-java → 1.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b86e0cbcf0af1bdd5f25742161fbc643df6f1905
-  data.tar.gz: 81b0ba3ff06133af583aaff1eed278d5e13e2e36
+  metadata.gz: 54f1bedbe81ed4f5f7be1e55396e635804caee90
+  data.tar.gz: 98653c65724ab0410128c74fa7d7423fea0d3353
 SHA512:
-  metadata.gz: 65411ae99b60937735bd5c6c1a1ee8ecc79be77da3847ccc9bbcbd05d94e16bf6ae7df03eb26ebec507328de30cc424b5b9b633cbc66a5e9b28e15f649e77e4d
-  data.tar.gz: 997cd52b905f8b8315b1608e5da33dd98c40442bc20f1d86e444d0350d13010d5e1fbd0d36ba021a4536baeb03ad9fc495fa2a5809b8a807ccd036c45f5ce864
+  metadata.gz: 34c87c741309e62954644936130e301c3ded6b007190c7ebf6ad9559f43b6bde2fafd3a02918308816ff6b35082442c1b5e1be145263328c2553511c9ac151bc
+  data.tar.gz: 294933dfbf85d177f2c14a7ba29c811c8ed8e17a955ce2e638804d8b5097ed983dfd4032d9eaa00cafcaab13889240d1aa39a640a16ff6d0c615786436580e89

data/bin/action_subscriber

@@ -36,6 +36,8 @@ module ActionSubscriber
         ::ActionSubscriber::Babou.auto_pop!
       when /subscribe/i then
         ::ActionSubscriber::Babou.start_subscribers
+      else
+        fail "ActionSubscriber.configuration.mode must be 'pop' or 'subscribe'.  Currently set to '#{::ActionSubscriber.configuration.mode}'"
       end
     end
   end

data/lib/action_subscriber.rb

@@ -14,6 +14,7 @@ require "action_subscriber/version"
 require "action_subscriber/default_routing"
 require "action_subscriber/dsl"
 require "action_subscriber/configuration"
+require "action_subscriber/message_retry"
 require "action_subscriber/middleware"
 require "action_subscriber/rabbit_connection"
 require "action_subscriber/subscribable"

data/lib/action_subscriber/base.rb

@@ -80,7 +80,8 @@ module ActionSubscriber
       yield
       acknowledge
     rescue => error
-      reject
+      ::ActionSubscriber::MessageRetry.redeliver_message_with_backoff(env)
+      acknowledge
       raise error
     end
 

data/lib/action_subscriber/bunny/subscriber.rb

@@ -24,8 +24,10 @@ module ActionSubscriber
               :content_type => properties[:content_type],
               :delivery_tag => delivery_info.delivery_tag,
               :exchange => delivery_info.exchange,
+              :headers => properties.headers,
               :message_id => nil,
               :routing_key => delivery_info.routing_key,
+              :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(self, encoded_payload, properties)
             enqueue_env(env)
@@ -45,8 +47,10 @@ module ActionSubscriber
               :content_type => properties.content_type,
               :delivery_tag => delivery_info.delivery_tag,
               :exchange => delivery_info.exchange,
+              :headers => properties.headers,
               :message_id => properties.message_id,
               :routing_key => delivery_info.routing_key,
+              :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(self, encoded_payload, properties)
             enqueue_env(env)

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -12,16 +12,18 @@ module ActionSubscriber
         times_to_pop = [::ActionSubscriber::Threadpool.ready_size, ::ActionSubscriber.config.times_to_pop].min
         times_to_pop.times do
           queues.each do |queue|
-            header, encoded_payload = queue.pop(queue_subscription_options)
+            metadata, encoded_payload = queue.pop(queue_subscription_options)
             next unless encoded_payload
             ::ActiveSupport::Notifications.instrument "popped_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
               :channel => queue.channel,
-              :content_type => header.content_type,
-              :delivery_tag => header.delivery_tag,
-              :exchange => header.exchange,
-              :message_id => header.message_id,
-              :routing_key => header.routing_key,
+              :content_type => metadata.content_type,
+              :delivery_tag => metadata.delivery_tag,
+              :exchange => metadata.exchange,
+              :headers => _normalized_headers(metadata),
+              :message_id => metadata.message_id,
+              :routing_key => metadata.routing_key,
+              :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(self, encoded_payload, properties)
             enqueue_env(env)
@@ -35,15 +37,17 @@ module ActionSubscriber
       def auto_subscribe!
         queues.each do |queue|
           queue.channel.prefetch = ::ActionSubscriber.config.prefetch if acknowledge_messages?
-          consumer = queue.subscribe(queue_subscription_options) do |header, encoded_payload|
+          consumer = queue.subscribe(queue_subscription_options) do |metadata, encoded_payload|
             ::ActiveSupport::Notifications.instrument "received_event.action_subscriber", :payload_size => encoded_payload.bytesize, :queue => queue.name
             properties = {
               :channel => queue.channel,
-              :content_type => header.content_type,
-              :delivery_tag => header.delivery_tag,
-              :exchange => header.exchange,
-              :message_id => header.message_id,
-              :routing_key => header.routing_key,
+              :content_type => metadata.content_type,
+              :delivery_tag => metadata.delivery_tag,
+              :exchange => metadata.exchange,
+              :headers => _normalized_headers(metadata),
+              :message_id => metadata.message_id,
+              :routing_key => metadata.routing_key,
+              :queue => queue.name,
             }
             env = ::ActionSubscriber::Middleware::Env.new(self, encoded_payload, properties)
             enqueue_env(env)
@@ -66,6 +70,13 @@ module ActionSubscriber
           end
         end
       end
+
+      def _normalized_headers(metadata)
+        return {} unless metadata.headers
+        metadata.headers.each_with_object({}) do |(header,value), hash|
+          hash[header] = value.to_s
+        end
+      end
     end
   end
 end

data/lib/action_subscriber/message_retry.rb

@@ -0,0 +1,60 @@
+module ActionSubscriber
+  module MessageRetry
+    SCHEDULE = {
+      2  =>        100,
+      3  =>        500,
+      4  =>      2_500,
+      5  =>     12_500,
+      6  =>     62_500,
+      7  =>    312_500,
+      8  =>  1_562_500,
+      9  =>  7_812_500,
+      10 => 39_062_500,
+    }.freeze
+
+    def self.redeliver_message_with_backoff(env)
+      next_attempt = get_last_attempt_number(env) + 1
+      ttl = SCHEDULE[next_attempt]
+      return unless ttl
+      with_exchange(env, ttl) do |exchange|
+        exchange.publish(env.encoded_payload, retry_options(env, next_attempt))
+      end
+    end
+
+    # Private Implementation
+    def self.get_last_attempt_number(env)
+      attempt_header = env.headers.fetch("as-attempt", "1")
+      attempt_header.to_i
+    end
+
+    def self.retry_headers(env, attempt)
+      env.headers.reject do |key, val|
+        key == "x-death"
+      end.merge({"as-attempt" => attempt.to_s})
+    end
+
+    def self.retry_options(env, attempt)
+      {
+        :content_type => env.content_type,
+        :routing_key => env.routing_key,
+        :headers => retry_headers(env, attempt),
+      }
+    end
+
+    def self.with_exchange(env, ttl)
+      exchange_retry_name = "#{env.exchange}_retry_#{ttl}"
+      queue_retry_name = "#{env.queue}_retry_#{ttl}"
+      channel = RabbitConnection.subscriber_connection.create_channel
+      begin
+        channel.confirm_select
+        exchange = channel.topic(exchange_retry_name)
+        queue = channel.queue(queue_retry_name, :arguments => {"x-dead-letter-exchange" => env.exchange, "x-message-ttl" => ttl})
+        queue.bind(exchange, :routing_key => env.routing_key)
+        yield(exchange)
+        channel.wait_for_confirms
+      ensure
+        channel.close rescue nil
+      end
+    end
+  end
+end

data/lib/action_subscriber/middleware/env.rb

@@ -6,8 +6,10 @@ module ActionSubscriber
       attr_reader :content_type,
                   :encoded_payload,
                   :exchange,
+                  :headers,
                   :message_id,
                   :routing_key,
+                  :queue,
                   :subscriber
 
       ##
@@ -18,16 +20,18 @@ module ActionSubscriber
       #         :content_type => String
       #         :delivery_tag => String (the message identifier to send back to rabbitmq for acknowledgement)
       #         :exchange => String
+      #         :headers => Hash[ String => String ]
       #         :message_id => String
       #         :routing_key => String
-      
       def initialize(subscriber, encoded_payload, properties)
         @channel = properties.fetch(:channel)
         @content_type = properties.fetch(:content_type)
         @delivery_tag = properties.fetch(:delivery_tag)
         @encoded_payload = encoded_payload
         @exchange = properties.fetch(:exchange)
+        @headers = properties.fetch(:headers) || {}
         @message_id = properties.fetch(:message_id)
+        @queue = properties.fetch(:queue)
         @routing_key = properties.fetch(:routing_key)
         @subscriber = subscriber
       end

data/lib/action_subscriber/publisher.rb

@@ -25,10 +25,12 @@ module ActionSubscriber
       end
     end
 
-    def self.publishing_options(route, options = {})
-      options[:mandatory] = false unless options.key(:mandatory)
-      options[:persistent] = false unless options.key(:persistent)
-      options[:routing_key] = route
+    def self.publishing_options(route, in_options = {})
+      options = {
+        :mandatory => false,
+        :persistent => false,
+        :routing_key => route,
+      }.merge(in_options)
 
       if ::RUBY_PLATFORM == "java"
         java_options = {}

data/lib/action_subscriber/rspec.rb

@@ -17,8 +17,10 @@ module ActionSubscriber
       :content_type => "text/plain",
       :delivery_tag => "XYZ",
       :exchange => "events",
+      :headers => {},
       :message_id => "MSG-123",
       :routing_key => "amigo.user.created",
+      :queue => "test.amigo.user.created",
     }.freeze
 
     # Create a new subscriber instance. Available options are:
@@ -73,8 +75,10 @@ end
       :content_type => "text/plain",
       :delivery_tag => "XYZ",
       :exchange => "events",
+      :headers => {},
       :message_id => "MSG-123",
       :routing_key => "amigo.user.created",
+      :queue => "test.amigo.user.created",
     }}
   end
 

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.3.0.rc0"
+  VERSION = "1.4.0"
 end

data/spec/integration/at_least_once_spec.rb

@@ -17,7 +17,7 @@ describe "at_least_once! mode", :integration => true do
     exchange = channel.topic("events")
     exchange.publish("GrumpFace", :routing_key => "gorby_puff.grumpy")
 
-    verify_expectation_within(1.0) do
+    verify_expectation_within(2.0) do
       expect($messages).to eq Set.new(["GrumpFace::0","GrumpFace::1","GrumpFace::2"])
     end
   end

data/spec/integration/custom_headers_spec.rb

@@ -0,0 +1,27 @@
+class PrankSubscriber < ActionSubscriber::Base
+  publisher :pikitis
+
+  def pulled
+    $messages << env.headers
+  end
+end
+
+describe "Custom Headers Are Published and Received", :integration => true do
+  let(:headers) { { "Custom" => "content/header" } }
+
+  it "works for auto_pop!" do
+    ::ActionSubscriber::Publisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
+    verify_expectation_within(2.0) do
+      ::ActionSubscriber.auto_pop!
+      expect($messages).to eq(Set.new([headers]))
+    end
+  end
+
+  it "works for auto_subscriber!" do
+    ::ActionSubscriber.auto_subscribe!
+    ::ActionSubscriber::Publisher.publish("pikitis.prank.pulled", "Yo Knope!", "events", :headers => headers)
+    verify_expectation_within(2.0) do
+      expect($messages).to eq(Set.new([headers]))
+    end
+  end
+end

data/spec/lib/action_subscriber/middleware/env_spec.rb

@@ -7,8 +7,10 @@ describe ActionSubscriber::Middleware::Env do
     :delivery_tag => "XYZ",
     :encoded_payload => encoded_payload,
     :exchange => "events",
+    :headers => {},
     :message_id => "MSG-1234",
     :routing_key => "amigo.user.created",
+    :queue => "test.amigo.user.created",
   } }
   let(:subscriber) { UserSubscriber }
 
@@ -17,8 +19,10 @@ describe ActionSubscriber::Middleware::Env do
   specify { expect(subject.action).to eq("created") }
   specify { expect(subject.content_type).to eq(properties[:content_type]) }
   specify { expect(subject.exchange).to eq(properties[:exchange]) }
+  specify { expect(subject.headers).to eq(properties[:headers]) }
   specify { expect(subject.message_id).to eq(properties[:message_id]) }
   specify { expect(subject.routing_key).to eq(properties[:routing_key]) }
+  specify { expect(subject.queue).to eq(properties[:queue]) }
 
   describe "#acknowledge" do
     it "sends an acknowledgement to rabbitmq" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc0
+  version: 1.4.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ files:
 - lib/action_subscriber/default_routing.rb
 - lib/action_subscriber/dsl.rb
 - lib/action_subscriber/march_hare/subscriber.rb
+- lib/action_subscriber/message_retry.rb
 - lib/action_subscriber/middleware.rb
 - lib/action_subscriber/middleware/active_record/connection_management.rb
 - lib/action_subscriber/middleware/active_record/query_cache.rb
@@ -222,6 +223,7 @@ files:
 - spec/integration/at_most_once_spec.rb
 - spec/integration/automatic_reconnect_spec.rb
 - spec/integration/basic_subscriber_spec.rb
+- spec/integration/custom_headers_spec.rb
 - spec/integration/decoding_payloads_spec.rb
 - spec/integration/manual_acknowledgement_spec.rb
 - spec/lib/action_subscriber/base_spec.rb
@@ -254,9 +256,9 @@ 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.4.8
@@ -269,6 +271,7 @@ test_files:
 - spec/integration/at_most_once_spec.rb
 - spec/integration/automatic_reconnect_spec.rb
 - spec/integration/basic_subscriber_spec.rb
+- spec/integration/custom_headers_spec.rb
 - spec/integration/decoding_payloads_spec.rb
 - spec/integration/manual_acknowledgement_spec.rb
 - spec/lib/action_subscriber/base_spec.rb