diff --git a/hydra.gemspec b/hydra.gemspec index 0dbacc0..fe8ae45 100644 --- a/hydra.gemspec +++ b/hydra.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Nick Gauthier"] - s.date = %q{2010-04-22} + s.date = %q{2010-04-28} s.description = %q{Spread your tests over multiple machines to test your code faster.} s.email = %q{nick@smartlogicsolutions.com} s.extra_rdoc_files = [ diff --git a/lib/hydra/master.rb b/lib/hydra/master.rb index bce6367..76891b2 100644 --- a/lib/hydra/master.rb +++ b/lib/hydra/master.rb @@ -83,7 +83,9 @@ def send_file(worker) # Process the results coming back from the worker. def process_results(worker, message) - if message.output =~ /ActiveRecord::StatementInvalid(.*)[Dd]eadlock/ + if message.output =~ /ActiveRecord::StatementInvalid(.*)[Dd]eadlock/ or + message.output =~ /PGError: ERROR(.*)[Dd]eadlock/ or + message.output =~ /Mysql::Error: SAVEPOINT(.*)does not exist: ROLLBACK/ trace "Deadlock detected running [#{message.file}]. Will retry at the end" @files.push(message.file) else