action_subscriber 1.7.0 → 2.0.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573c8a147dbac009a027ad0d10b404484fc8221f
-  data.tar.gz: c137c197e7d3e047d836af47865ad41776e34ad6
+  metadata.gz: 598fa055880a3b6156840d9078febee5c3146777
+  data.tar.gz: f49e5bcef1fd6752084a2759472164cd2ff27c65
 SHA512:
-  metadata.gz: 22868e675b4aeddcff1627423628be69c9db6562ce35bfefb7e1121b74756fbbd6132bc9246dd5b80d14f2a9e5bbf63e5c03793725833c741ef28e28375dad44
-  data.tar.gz: 65b0a782d1791ba8a49a4f2c6a7e9ca2c6aefcdb026ac246dd607eb55d87dbdd05aae998df8393048e72953152f711429bc4af6816c0586a8ef159c7bef82ed3
+  metadata.gz: 66ceef1357703ca528f884e68486d0c8f8f40c956bebefdf2b6b520fb4603a4195f81c2d3006028d6f87637150540333f2769159ab8cd097a8d67ddec5fdd223
+  data.tar.gz: 7d5e4c2a4a7aa79bc92d7af7ef3c887fc7de9c445f669fcdca95b6fb41b88b961a6278441e9c5c5dee79e5dd523387ba238584bc59c32fe3121945777e48eefc

data/lib/action_subscriber/bunny/subscriber.rb

@@ -66,7 +66,7 @@ module ActionSubscriber
       def enqueue_env(threadpool, env)
         logger.info "RECEIVED #{env.message_id} from #{env.queue}"
         threadpool.async(env) do |env|
-          ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key do
+          ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key, :queue => env.queue do
             ::ActionSubscriber.config.middleware.call(env)
           end
         end

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -67,7 +67,7 @@ module ActionSubscriber
       def enqueue_env(threadpool, env)
         logger.info "RECEIVED #{env.message_id} from #{env.queue}"
         threadpool.async(env) do |env|
-          ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key do
+          ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key, :queue => env.queue do
             ::ActionSubscriber.config.middleware.call(env)
           end
         end

data/lib/action_subscriber/message_retry.rb

@@ -16,8 +16,9 @@ module ActionSubscriber
       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))
+      retry_queue_name = "#{env.queue}.retry_#{ttl}"
+      with_exchange(env, ttl, retry_queue_name) do |exchange|
+        exchange.publish(env.encoded_payload, retry_options(env, next_attempt, retry_queue_name))
       end
     end
 
@@ -30,26 +31,27 @@ module ActionSubscriber
     def self.retry_headers(env, attempt)
       env.headers.reject do |key, val|
         key == "x-death"
-      end.merge({"as-attempt" => attempt.to_s})
+      end.merge({
+        "as-attempt" => attempt.to_s,
+        "x-dead-letter-routing-key" => env.queue,
+      })
     end
 
-    def self.retry_options(env, attempt)
+    def self.retry_options(env, attempt, retry_queue_name)
       {
         :content_type => env.content_type,
-        :routing_key => env.routing_key,
+        :routing_key => retry_queue_name,
         :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}"
+    def self.with_exchange(env, ttl, retry_queue_name)
       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)
+        # an empty string is the default exchange [see bunny docs](http://rubybunny.info/articles/exchanges.html#default_exchange)
+        exchange = channel.topic("")
+        queue = channel.queue(retry_queue_name, :arguments => {"x-dead-letter-exchange" => "", "x-message-ttl" => ttl, "x-dead-letter-routing-key" => env.queue})
         yield(exchange)
         channel.wait_for_confirms
       ensure

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.7.0"
+  VERSION = "2.0.0.pre0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0.pre0
 platform: ruby
 authors:
 - Brian Stien
@@ -265,9 +265,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1