rabbit-wq 0.1.0 → 0.2.0

data/README.md

@@ -64,3 +64,8 @@ Auto-scale will set up retries at the following intervals: 1 min, 5 mins, 15 min
     
     worker = SomeWorker.new( 1 )
     worker.work # same as RabbitWQ::Work.enqueue( worker )
+
+### Error Queue
+
+Once a worker has thrown an exception and no retry attempts are remaining, the worker is placed on 
+the error queue with the exception type, message and backtraces.

data/lib/rabbit_wq/message_handler.rb

@@ -14,12 +14,11 @@ module RabbitWQ
       channel       = options[:channel]
       delivery_info = options[:delivery_info]
       metadata      = options[:metadata]
-      headers       = metadata[:headers]
+      #headers       = metadata[:headers]
       payload       = options[:payload]
 
       debug "PAYLOAD ARRIVED #{payload}"
 
-      $stdout.puts headers.inspect
       worker = YAML::load( payload )
       worker.call
       channel.ack delivery_info.delivery_tag
@@ -34,18 +33,26 @@ module RabbitWQ
       headers = metadata[:headers]
 
       if headers['retry']
-        retry_delay = headers.fetch( 'retry_delay', 30000 )
         attempt = headers.fetch( 'attempt', 1 ).to_i
 
-        if retry_delay == 'auto-scale'
-          retry_delay = retry_delays( attempt )
-        end
+        if attempt < headers['retry']
+          retry_delay = headers.fetch( 'retry_delay', 30000 )
 
-        Work.enqueue_payload( payload, headers.merge( delay: retry_delay, attempt: attempt + 1 ))
-        channel.nack delivery_info.delivery_tag
+          if retry_delay == 'auto-scale'
+            retry_delay = retry_delays( attempt )
+          end
 
-        return
+          Work.enqueue_payload( payload, headers.merge( delay: retry_delay, attempt: attempt + 1 ))
+          channel.nack delivery_info.delivery_tag
+          return
+        end
       end
+
+      Work.enqueue_error_payload( payload, error: { type: e.class.name,
+                                                    message: e.message,
+                                                    backtrace: e.backtrace } )
+      channel.nack delivery_info.delivery_tag
+      return
     end
 
     def requeue( channel, delivery_info, e=nil )

data/lib/rabbit_wq/version.rb

@@ -1,3 +1,3 @@
 module RabbitWQ
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/rabbit_wq/work.rb

@@ -35,6 +35,14 @@ module RabbitWQ
                                headers: options )
     end
 
+    def self.enqueue_error_payload( payload, options={} )
+      mq = ::Bunny.new.tap { |bunny| bunny.start }
+      channel = mq.create_channel
+
+      error_q = channel.queue( ERROR_QUEUE, durable: true )
+      error_q.publish( payload, durable: true,
+                                headers: options )
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit-wq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2689177657118754314
+      hash: -1504652558847638442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2689177657118754314
+      hash: -1504652558847638442
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25