watership 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e825dbc60d67c45423b86b865f630d48242239
-  data.tar.gz: 55835caea73ac3020b4cf70c3b8bfec698825af3
+  metadata.gz: c343b8f27c9dfabdbef3863bda8a918eeaf0097a
+  data.tar.gz: 977ef5d709616c80d9c3ca07a5d05dbd0f378570
 SHA512:
-  metadata.gz: caab85ff97258c61cef701ba7cfc19709fae52c053f134bc127015f314ebd697d4580f3e16146368778a6c3c75c6ff9a9b2149ecd4bb21a0ab8e1a526ec2d41d
-  data.tar.gz: 87531c4b68d56233360dab2477093245ec4794849cc098def7e4304af8538dc6f99787cbd2d74575f9d784cd035218cf1a2e51b876535585822a6e83cd415399
+  metadata.gz: 99cc83e6ad322b28593c8ff9193343dc0f1c80a45e9a43219eeeafeb324ccde6d6057fc20edcc56c134e37716000227d60d3df045badff6d6e1fab718044c140
+  data.tar.gz: d763b661e3ecaa1df2bd646ae240d6eddc7a9ce865375996e7c9eef303e78afb07704460365ba448b3ac3b07050c680378fff72393e326918349ea4d4144386f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.4.0 - 2014-07-10
+* Add retry behavior on messages that generate exceptions in `Watership::Consumer`.
+
 ## 0.3.5, 0.3.6, 0.3.7 - 2014-06-20
 * Remove dependency on Rails in `Watership::Consumer`.
 

data/lib/watership/consumer.rb

@@ -16,28 +16,32 @@ module Watership
       Thread.abort_on_exception = true
       begin
         queue.subscribe(@queue_opts) do |delivery_info, properties, payload|
-          success = false
+          success = true
+          data = JSON.parse(payload)
           begin
-            @consumer.call(JSON.parse(payload))
-            success = true
+            @consumer.call(data)
+            ack_message(delivery_info.delivery_tag)
           rescue StandardError => exception
             logger.error "Error thrown in subscribe block"
             logger.error exception.message
             logger.error exception.backtrace.join("\n")
-            Airbrake.notify(exception) if defined?(AirBrake)
-            logger.info "Rejecting in rabbit"
-            throw(:terminate)
+
+            retries = data["retries"] || 0
+
+            if retries.to_i < 3
+              Watership.enqueue(name: @consumer.class::QUEUE, payload: data.merge({retries: retries+1}))
+            end
+
+            Airbrake.notify(exception) if defined?(Airbrake)
+            Bugsnag.notify(exception, data: {payload: data, retries: retries}) if defined?(Bugsnag)
           rescue Interrupt => exception
+            success = false
             logger.error "Interrupt in subscribe block"
             logger.warn "Stopped gracefully."
             throw(:terminate)
           ensure
-            if success
-              logger.info "Acking message"
-              channel.acknowledge(delivery_info.delivery_tag, false)
-            else
-              logger.info "Rejecting message"
-              channel.reject(delivery_info.delivery_tag, true)
+            unless success
+              reject_message(delivery_info.delivery_tag)
             end
           end
         end
@@ -48,6 +52,15 @@ module Watership
     end
 
     private
+    def ack_message(tag)
+      logger.info "Acking message"
+      channel.acknowledge(tag, false)
+    end
+
+    def reject_message(tag)
+      logger.info "Rejecting message"
+      channel.reject(tag, true)
+    end
 
     def queue
       @queue ||= channel.queue(@consumer.class::QUEUE, @channel_opts)

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler