Merge pull request #269 from RusHibaM/master

Make sure to also rescue non-standard error

lib/parallel.rb

@@ -469,7 +469,9 @@ def process_incoming_jobs(read, write, job_factory, options, &block)
         item, index = job_factory.unpack(data)
         result = begin
           call_with_index(item, index, options, &block)
-        rescue
+        rescue SystemExit, SignalException
+          raise $!
+        rescue Exception
           ExceptionWrapper.new($!)
         end
         begin

spec/cases/exception_raised_in_process.rb

@@ -0,0 +1,11 @@
+require './spec/cases/helper'
+
+begin
+  Parallel.each([1]){ raise Exception }
+rescue Parallel::DeadWorker
+  puts "No, DEAD worker found"
+rescue Exception
+  puts "Yep, rescued the exception"
+else
+  puts "WHOOOPS"
+end

spec/parallel_spec.rb

@@ -385,6 +385,10 @@ def cpus
       `ruby spec/cases/exit_in_process.rb 2>&1`.should include "Yep, DEAD"
     end
 
+    it "should rescue the Exception raised in child process" do
+      `ruby spec/cases/exception_raised_in_process.rb 2>&1`.should include "Yep, rescued the exception"
+    end
+
     it 'raises EOF (not DeadWorker) when a worker raises EOF in process' do
       `ruby spec/cases/eof_in_process.rb 2>&1`.should include 'Yep, EOF'
     end