Signed-off-by: Paul Kelly <paul.ian.kelly@googlemail.com>
···
--- app/models/orchestration.rb | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)diff --git a/app/models/orchestration.rb b/app/models/orchestration.rb
index 682567c…5d4d0b3 100644
— a/app/models/orchestration.rb
+++ b/app/models/orchestration.rb
@@ -79,7 +79,8 @@ module Orchestration
# process all pending tasks
q.pending.each do |task|
# if we have failures, we don’t want to process any more tasks
-
next unless q.failed.empty?
-
break unless q.failed.empty? -
task.status = "running" begin task.status = execute({:action => task.action}) ? "completed" : "failed"
@@ -88,6 +89,9 @@ module Orchestration
task.status = “conflict”
@record_conflicts << e
failure e.message
-
rescue RestClient::Exception => e -
task.status = "failed" -
failure "#{task.name} task failed with the following error: #{e.response}" rescue => e task.status = "failed" failure "#{task.name} task failed with the following error: #{e}"
–
1.7.5.4