resque_jobs_tree 0.4.0 → 0.4.1

data/lib/resque_jobs_tree/definitions.rb

@@ -9,7 +9,7 @@ class ResqueJobsTree::Definitions
 	end
 
 	def after_perform &block
-    @before_perform ||= block
+    @after_perform ||= block
 	end
 
 end

data/lib/resque_jobs_tree/node.rb

@@ -25,7 +25,7 @@ class ResqueJobsTree::Node
   end
 
   def after_perform
-    run_callback :after_perform
+    run_callback(:after_perform)
     if root?
       tree.finish
     else
@@ -91,6 +91,13 @@ class ResqueJobsTree::Node
   def run_callback callback
     callback_block = definition.send callback
     callback_block.call(*resources) if callback_block.kind_of? Proc
+  rescue
+    if callback == :after_perform
+      puts "[ResqueJobsTree::Tree] after_perform callback of node #{definition.tree.name}##{name} has failed."\
+           " Continuing for cleanup."
+    else
+      raise 
+    end
   end
 
 end

data/lib/resque_jobs_tree/tree.rb

@@ -23,10 +23,16 @@ class ResqueJobsTree::Tree
     end
   end
 
-  %w(before_perform after_perform on_failure).each do |callback|
+  %w(before_perform after_perform).each do |callback|
     class_eval %Q{def #{callback} ; run_callback :#{callback} ; end}
   end
 
+  def on_failure
+    run_callback :on_failure
+  rescue
+    puts "[ResqueJobsTree::Tree] on_failure callback of tree #{name} has failed. Continuing for cleanup."
+  end
+
   def root
     @root ||= ResqueJobsTree::Node.new(definition.root, resources, nil, self)
   end

data/lib/resque_jobs_tree/version.rb

@@ -1,3 +1,3 @@
 module ResqueJobsTree
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/process_test.rb

@@ -199,6 +199,39 @@ class ProcessTest < MiniTest::Unit::TestCase
       Resque.redis.smembers("ResqueJobsTree:Node:[\"tree1\",\"job1\"]:childs")
   end
 
+  def test_exception_in_on_failure_callback
+    Resque.inline = false
+    tree_definition = ResqueJobsTree::Factory.create :tree1 do
+      on_failure { raise 'an unexpected exception' }
+      root :job1 do
+        perform { raise ExpectedException, 'an expected exception'}
+      end
+    end
+    tree_definition.spawn([]).launch
+    assert_raises ExpectedException do
+      silenced_stdout do
+        run_resque_workers tree_definition.name
+      end
+    end
+    assert_equal ['queues'], Resque.redis.keys
+  end
+
+  def test_exception_in_after_perform_callback
+    Resque.inline = false
+    tree_definition = ResqueJobsTree::Factory.create :tree1 do
+      root :job1 do
+        after_perform { raise 'an unexpected exception'  }
+        perform {}
+      end
+    end
+    assert tree_definition.find(:job1).after_perform.kind_of?(Proc)
+    tree_definition.spawn([]).launch
+    silenced_stdout do
+      run_resque_workers tree_definition.name
+    end
+    assert_equal [], Resque.redis.keys
+  end
+
   private
 
   def assert_redis_empty
@@ -211,4 +244,12 @@ class ProcessTest < MiniTest::Unit::TestCase
     redis.srem 'queues', queue_name
   end
 
+  def silenced_stdout
+    orig_stdout = $stdout
+    $stdout = File.new('/dev/null', 'w')
+    yield
+  ensure
+    $stdout = orig_stdout
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_jobs_tree
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler