ntswf 2.0.4 → 2.0.5

data/lib/ntswf/activity_worker.rb

@@ -21,8 +21,10 @@ module Ntswf
     #   Processing result. The following keys are interpreted accordingly:
     #   :error:: Fails the task with the given error details.
     #   :outcome:: Completes the task, storing the outcome's value (as JSON).
+    #   :seconds_until_restart::
+    #     Starts the task as new, after the given delay.
     #   :seconds_until_retry::
-    #     Re-schedules the task after the given delay.
+    #     Re-schedules the task, after the given delay.
     #     In combination with an *:error*: Marks the task for immediate re-scheduling,
     #     ignoring the value.
     #     Please note that the behaviour is undefined if an *:interval* option has been set.

data/lib/ntswf/decision_worker.rb

@@ -36,7 +36,7 @@ module Ntswf
       log("processing event #{event.inspect}")
       case event.event_type
       when 'WorkflowExecutionStarted' then schedule(task, event)
-      when 'TimerFired' then retry_or_continue_as_new(task, task.events.first)
+      when 'TimerFired' then retry_or_continue_as_new(task, event)
       when 'ActivityTaskCompleted' then activity_task_completed(task, event)
       when 'ActivityTaskFailed' then activity_task_failed(task, event)
       when 'ActivityTaskTimedOut' then activity_task_timed_out(task, event)
@@ -45,8 +45,7 @@ module Ntswf
 
     def activity_task_completed(task, event)
       result = parse_result(event.attributes.result)
-      start_timer(task, result["seconds_until_retry"]) or task.complete_workflow_execution(
-          result: event.attributes.result)
+      start_timer(task, result) or task.complete_workflow_execution(result: event.attributes.result)
     end
 
     def activity_task_failed(task, event)
@@ -64,18 +63,19 @@ module Ntswf
       start_timer(task) or task.cancel_workflow_execution(details: 'activity task timeout')
     end
 
-    def start_timer(task, interval = nil)
+    def start_timer(task, result = {})
+      interval = result["seconds_until_retry"] || result["seconds_until_restart"]
       unless interval
         options = parse_input(task.events.first.attributes.input)
         interval = options['interval']
       end
-      task.start_timer(interval.to_i) if interval
+      task.start_timer(interval.to_i, control: result.to_json) if interval
       interval
     end
 
-    def retry_or_continue_as_new(task, original_event)
-      options = parse_input(original_event.attributes.input)
-      if options['interval']
+    def retry_or_continue_as_new(task, event)
+      original_event = task.events.first
+      if to_be_continued?(task, event)
         keys = [
           :child_policy,
           :execution_start_to_close_timeout,
@@ -118,6 +118,14 @@ module Ntswf
 
     private
 
+    def to_be_continued?(task, event)
+      options = parse_input(task.events.first.attributes.input)
+      return true if options["interval"]
+      started_event = task.events.find { |e| e.event_id == event.attributes.started_event_id }
+      result = parse_result(started_event.attributes.to_h[:control])
+      result["seconds_until_restart"] || result["perform_again"]
+    end
+
     # transitional, until all apps speak the input options protocol
     def guess_app_from(data_providing_event)
       data_providing_event.workflow_execution.workflow_type.name[/\w+/]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntswf
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk