sneakers_handlers 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6171b028c2674e05b3e2c3f0ae4d0a5eff055a4
-  data.tar.gz: f0c361710063ef3aabf29ca22ea253e69420e606
+  metadata.gz: cbe7ce0c08c9dfeccda3bd303f43ecc73d2dabfb
+  data.tar.gz: ca72c9cceddd50e52f76a2c710ed043e098f1b5e
 SHA512:
-  metadata.gz: 40cd50b730aec166522c3d2a11bae66f86d36b41c13012981008dc85537759b34a40eb0f960acddee0c4c57bba02df2fef25f750021d8dbfd370248a079b1e67
-  data.tar.gz: d1c68dbb52716b7b1d17c61b46aedf2b7e482630b411b686a38fcf1dd67bf59dab8092f48c8dcd3b8e5cb2c41a16fa5bd7f4dd0378414f37f36710d0c1032d9c
+  metadata.gz: c1937bf40e060b1c0e3f0f874ed196237ba371a1e9d2df17cfa63df8cfc07583d8f03e198dc40f8a10fbd4ecc4be4ea6f9a0465bc554712bd7b2298d64fdc53c
+  data.tar.gz: 8542234aa0d5c19d48207e8e8e03535ceb3fd4868cf409bd614e532f415c4e906cc6693736ca577a74a7ab5ace80887ccd3b8e0c0ae594363ed648ddfe06745e

data/README.md

@@ -55,7 +55,7 @@ class RetryWorker
 
   from_queue "sneakers_handlers.my_queue",
       ack: true,
-      exchange: "sneaker_handlers",
+      exchange: "sneakers_handlers",
       exchange_type: :topic,
       routing_key: "sneakers_handlers.retry_test",
 +     handler: SneakersHandlers::RetryHandler,
@@ -86,7 +86,7 @@ class ExponentialBackoffWorker
 
   from_queue "sneakers_handlers.my_queue",
       ack: true,
-      exchange: "sneaker_handlers",
+      exchange: "sneakers_handlers",
       exchange_type: :topic,
       routing_key: "sneakers_handlers.backoff_test",
 +     handler: SneakersHandlers::ExponentialBackoffHandler,
@@ -109,7 +109,7 @@ class ExponentialBackoffWorker
 
   from_queue "sneakers_handlers.my_queue",
       ack: true,
-      exchange: "sneaker_handlers",
+      exchange: "sneakers_handlers",
       exchange_type: :topic,
       routing_key: "sneakers_handlers.backoff_test",
       handler: SneakersHandlers::ExponentialBackoffHandler,

data/lib/sneakers_handlers/exponential_backoff_handler.rb

@@ -63,6 +63,8 @@ module SneakersHandlers
 
     def retry_message(delivery_info, properties, message, reason)
       attempt_number = death_count(properties[:headers])
+      headers = (properties[:headers] || {}).merge(rejection_reason: reason.to_s)
+      headers = remove_delayed_message_header(headers)
 
       if attempt_number < max_retries
         delay = backoff_function.call(attempt_number)
@@ -74,13 +76,25 @@ module SneakersHandlers
         retry_queue = create_retry_queue!(delay)
         retry_queue.bind(primary_exchange, routing_key: routing_key)
 
-        headers = (properties[:headers] || {}).merge(rejection_reason: reason.to_s)
         primary_exchange.publish(message, routing_key: routing_key, headers: headers)
-        acknowledge(delivery_info, properties, message)
       else
         log("msg=erroring, count=#{attempt_number}, properties=#{properties}")
-        channel.reject(delivery_info.delivery_tag)
+        error_exchange.publish(message, routing_key: dlx_routing_key, headers: headers)
       end
+
+      acknowledge(delivery_info, properties, message)
+    end
+
+    # This is the header used by the `rabbitmq-delayed-message-exchange`
+    # plugin.  We need to remove it otherwise the messages that are published
+    # to the retry queues would also be delayed. This becomes a bigger problem
+    # when we have queues that expire (using `x-expires`) shortly after they
+    # are created. If, for instance, we have a retry queue that expires in 5
+    # seconds, and we publish a message with `x-delay` of `6000`, by the time
+    # this message is ready to be published, the queue doesn't exist anymore,
+    # resulting in a message loss.
+    def remove_delayed_message_header(headers)
+      headers.reject { |k| k == "x-delay" }
     end
 
     def death_count(headers)
@@ -97,28 +111,35 @@ module SneakersHandlers
       end
     end
 
-    def create_exchange(name)
+    def create_exchange(name, type = "topic")
       log("creating exchange=#{name}")
 
-      channel.exchange(name, type: "topic", durable: options[:exchange_options][:durable])
+      channel.exchange(name, type: type, durable: options[:exchange_options][:durable])
     end
 
     def primary_exchange
-      @primary_exchange ||= create_exchange("#{options[:exchange]}")
+      @primary_exchange ||= create_exchange(options[:exchange], options[:exchange_options][:type])
     end
 
-    def create_error_exchange!
-      arguments = options[:queue_options][:arguments]
-
-      dlx_exchange_name = arguments.fetch("x-dead-letter-exchange")
-      dlx_routing_key = arguments.fetch("x-dead-letter-routing-key")
+    def error_exchange
+      @error_exchange ||= create_error_exchange!
+    end
 
-      @error_exchange ||= create_exchange(dlx_exchange_name).tap do |exchange|
+    def create_error_exchange!
+      create_exchange(dlx_exchange_name).tap do |exchange|
         queue = channel.queue("#{@queue.name}.error", durable: options[:queue_options][:durable])
         queue.bind(exchange, routing_key: dlx_routing_key)
       end
     end
 
+    def dlx_routing_key
+      options[:queue_options][:arguments].fetch("x-dead-letter-routing-key")
+    end
+
+    def dlx_exchange_name
+      options[:queue_options][:arguments].fetch("x-dead-letter-exchange")
+    end
+
     def create_retry_queue!(delay)
       clear_queues_cache
       channel.queue("#{queue.name}.retry.#{delay}",

data/lib/sneakers_handlers/version.rb

@@ -1,3 +1,3 @@
 module SneakersHandlers
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sneakers_handlers
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - John Bohn, Abe Petrillo, Brian Storti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sneakers