rabbit-wq 1.0.0 → 1.1.0

data/README.md

@@ -88,11 +88,35 @@ 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
+### Success Callback
 
-Once a worker has thrown an exception and no retry attempts are remaining, the worker is placed on 
+#### on_success
+
+Called on success when defined on a worker.
+
+
+### Error Handling
+
+Once a worker has raised an exception and no retry attempts are remaining, the worker is placed on 
 the error queue with the exception type, message and backtraces.
 
+#### Error Callbacks
+
+There are several error callbacks that will be called if defined on a worker.  Each error callback will receive
+a single parameter, the error.
+
+##### on_error
+
+Called anytime an error is raised, including if a retry will be attempted.
+
+##### on_final_error
+
+Called when an error is raised and either no retries were requested or are remaining.
+
+##### on_retryable_error
+
+Called when an error is raised and a retry will be attempted.
+
 ### Logging
 
 RabbitWQ provides a work logger that is available within all workers.  You must send a reference to self

data/lib/rabbit_wq/message_handler.rb

@@ -16,14 +16,12 @@ module RabbitWQ
       channel       = options[:channel]
       delivery_info = options[:delivery_info]
       metadata      = options[:metadata]
-      #headers       = metadata[:headers]
       payload       = options[:payload]
 
-      debug "PAYLOAD ARRIVED #{payload}"
-
       worker = YAML::load( payload )
       info ANSI.yellow { "WORKER [#{worker.object_id}] " + worker.inspect }
       worker.call
+      try_on_success_callback( worker )
       channel.ack delivery_info.delivery_tag
     rescue => e
       handle_error( worker, e, channel, delivery_info, payload, metadata )
@@ -50,15 +48,39 @@ module RabbitWQ
 
           Work.enqueue_payload( payload, headers.merge( delay: retry_delay, attempt: attempt + 1 ).
                                                  merge( error: error_metadata ))
+          worker_error( worker, "ERROR WITH RETRY " + error_metadata.inspect )
+          try_on_error_callback( worker, e )
+          try_on_retryable_error_callback( worker, e )
           channel.nack delivery_info.delivery_tag
           return
         end
       end
 
       Work.enqueue_error_payload( payload, error: error_metadata )
-      worker_error( worker, error_metadata.inspect )
+      worker_error( worker, "FINAL ERROR " + error_metadata.inspect )
+      try_on_error_callback( worker, e )
+      try_on_final_error_callback( worker, e )
       channel.nack delivery_info.delivery_tag
-      return
+    end
+
+    def try_on_success_callback( worker )
+      return unless worker.respond_to?( :on_success )
+      worker.on_success
+    end
+
+    def try_on_error_callback( worker, e )
+      return unless worker.respond_to?( :on_error )
+      worker.on_error( e )
+    end
+
+    def try_on_retryable_error_callback( worker, e )
+      return unless worker.respond_to?( :on_retryable_error )
+      worker.on_retryable_error( e )
+    end
+
+    def try_on_final_error_callback( worker, e )
+      return unless worker.respond_to?( :on_final_error )
+      worker.on_final_error( e )
     end
 
     def requeue( channel, delivery_info, e=nil )

data/lib/rabbit_wq/server.rb

@@ -53,8 +53,6 @@ module RabbitWQ
         Celluloid::Actor[:message_handler] = MessageHandler.new
       end
 
-      info "threads: #{threads}"
-
       @work_consumer = work_queue.subscribe( manual_ack: true ) do |delivery_info, metadata, payload|
         info "LISTENER RECEIVED #{payload}"
 

data/lib/rabbit_wq/version.rb

@@ -1,3 +1,3 @@
 module RabbitWQ
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/rabbit_wq/work_logger.rb

@@ -36,9 +36,6 @@ module RabbitWQ
 
     end
 
-    def level=( l )
-    end
-
   protected
 
     attr_reader :logger

data/lib/rabbit_wq/worker.rb

@@ -30,7 +30,7 @@ module RabbitWQ
     def with_logging
       info "BEGIN #{self.class.name}"
       yield
-      info "END #{self.class.name}"
+      info "END   #{self.class.name}"
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit-wq
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler