hydra 0.16.5 → 0.16.6

data/VERSION

@@ -1 +1 @@
-0.16.5
+0.16.6

data/hydra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydra}
-  s.version = "0.16.5"
+  s.version = "0.16.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Gauthier"]
-  s.date = %q{2010-04-20}
+  s.date = %q{2010-04-22}
   s.description = %q{Spread your tests over multiple machines to test your code faster.}
   s.email = %q{nick@smartlogicsolutions.com}
   s.extra_rdoc_files = [

data/lib/hydra/master.rb

@@ -83,13 +83,18 @@ module Hydra #:nodoc:
 
     # Process the results coming back from the worker.
     def process_results(worker, message)
-      @incomplete_files.delete_at(@incomplete_files.index(message.file))
-      trace "#{@incomplete_files.size} Files Remaining"
-      @event_listeners.each{|l| l.file_end(message.file, message.output) }
-      if @incomplete_files.empty?
-        shutdown_all_workers
+      if message.output =~ /ActiveRecord::StatementInvalid(.*)[Dd]eadlock/
+        trace "Deadlock detected running [#{message.file}]. Will retry at the end"
+        @files.push(message.file)
       else
-        send_file(worker)
+        @incomplete_files.delete_at(@incomplete_files.index(message.file))
+        trace "#{@incomplete_files.size} Files Remaining"
+        @event_listeners.each{|l| l.file_end(message.file, message.output) }
+        if @incomplete_files.empty?
+          shutdown_all_workers
+        else
+          send_file(worker)
+        end
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 16
-  - 5
-  version: 0.16.5
+  - 6
+  version: 0.16.6
 platform: ruby
 authors: 
 - Nick Gauthier
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency