task-orchestrator 0.0.18 → 0.0.19

data/examples/retry_handler

@@ -0,0 +1,20 @@
+orchestrator:
+  statedir: states
+  retry_handler:
+    description: retry handler test
+    save: true
+    steps:
+      - type: sequential
+        retries: 3
+        retry_delay: 1
+        on_failure: ignore
+        scripts:
+          - command: "bad bad command"
+            retry_handler: "echo Retry Handler"
+      - type: parallel
+        retries: 3
+        retry_delay: 1
+        on_failure: ignore
+        scripts:
+          - command: "bad bad parallel command"
+            retry_handler: "echo Retry Parallel Handler"

data/lib/orchestrator/task.rb

@@ -172,7 +172,7 @@ module Orchestrator
          command = { 'command' => interpolate_command(command) }
       elsif command.is_a?(Hash)
         invalid(error_prefix + " is missing command attribute") unless command.has_key?('command')
-        ['command', 'ok_handler', 'failure_handler', 'condition'].each do |attribute|
+        ['command', 'ok_handler', 'failure_handler', 'retry_handler', 'condition'].each do |attribute|
           if command.has_key?(attribute)
             invalid(error_prefix + " #{attribute} attribute is invalid") unless command[attribute].is_a?(String)
             command[attribute] = interpolate_command(command[attribute])
@@ -239,6 +239,7 @@ module Orchestrator
           end
         end
         step['failure_handler'] = validate_command(step['failure_handler'], 'task failure handler') if step.has_key?('failure_handler')
+        step['retry_handler'] = validate_command(step['retry_handler'], 'task retry handler') if step.has_key?('retry_handler')
       end
     end
 
@@ -382,6 +383,10 @@ EOF
 
         failures += 1
         break if @retries < failures
+        if script.has_key?('retry_handler')
+          timeout = script.has_key?('timeout') ? script['timeout'].to_i : @timeout
+          run_command(script['retry_handler'],timeout)
+        end
         sleep @retry_delay
       end
 
@@ -459,6 +464,10 @@ EOF
               break if @statuses[index]
               failures += 1
               break if failures > @retries
+              if step['scripts'][index].has_key?('retry_handler')
+                timeout = step['scripts'][index].has_key?('timeout') ? step['scripts'][index]['timeout'].to_i : @timeout
+                run_command(step['scripts'][index]['retry_handler'],timeout)
+              end
               sleep @retry_delay
             end
             run_post_script_handlers(step['scripts'][index],@statuses[index])

data/lib/orchestrator/version.rb

@@ -1,3 +1,3 @@
 module Orchestrator
-  VERSION ||= '0.0.18'
+  VERSION ||= '0.0.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-orchestrator
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -89,6 +89,7 @@ files:
 - lib/orchestrator/version.rb
 - lib/orchestrator/cli.rb
 - examples/sequential
+- examples/retry_handler
 - examples/failure_handler
 - examples/multistep
 - examples/parallel