action_subscriber 1.7.0.pre0-java → 2.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68350fb402dffbd21fecee459016821768b6fb58
-  data.tar.gz: 79bf21dd81ef09d53481cf1dcba66be42c5f63e1
+  metadata.gz: 3b735e55441bb363ffee337ccac2f4c035c9a2ab
+  data.tar.gz: aa191fc25e00b272dcce56aa44fc637613f1ecb5
 SHA512:
-  metadata.gz: 0315e70ef922b4aceedafc60d510973e548f4ccd2435edc007b9e88f35a46fc03e95405bf0824471c085df687f6c313696dbf0263fa8a35cf41777939a9d4ce0
-  data.tar.gz: be59f6fee787b749a0457e268265eae8a64130e7d2747cc8356d34fba48fe2b729dd8d6f94ff0ba3797d6016524c5d3d2588b1392364f73d4af0b9d3274a0fe6
+  metadata.gz: e17ca1faf6ceb7a0c0ac069617e06ce6f0514aead48023c81ad5612d85ec9e713c5fecab8cd994c1c1dcaa9b8322c4742cb64755498227600888ecd0a1da2104
+  data.tar.gz: baa20e82dab735f117c8c80304f706735c02822979bb02e299c6c5daf70929ddc3de95ae65f48a0adce3e5d80cbd6bff9eebae8b4f2adb00e71af5c964e1ed9c

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/middleware/env.rb

@@ -1,3 +1,5 @@
+require "securerandom"
+
 module ActionSubscriber
   module Middleware
     class Env
@@ -30,7 +32,7 @@ module ActionSubscriber
         @encoded_payload = encoded_payload
         @exchange = properties.fetch(:exchange)
         @headers = properties.fetch(:headers) || {}
-        @message_id = properties.fetch(:message_id) || ::Random.new.bytes(3).unpack("H*")[0]
+        @message_id = properties.fetch(:message_id) || ::SecureRandom.hex(3)
         @queue = properties.fetch(:queue)
         @routing_key = properties.fetch(:routing_key)
         @subscriber = subscriber

data/lib/action_subscriber/version.rb

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

data/spec/spec_helper.rb

@@ -10,9 +10,11 @@ require 'active_record'
 
 # Require spec support files
 require 'support/user_subscriber'
-
 require 'action_subscriber/rspec'
 
+# Silence the Logger
+::ActionSubscriber::Logging.initialize_logger(nil)
+
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre0
+  version: 2.0.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -264,9 +264,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.5.0