ntswf 2.0.1 → 2.0.2

data/lib/ntswf/activity_worker.rb

@@ -11,7 +11,9 @@ module Ntswf
     #   :activity_task:: The {AWS::SimpleWorkflow::ActivityTask}
     #   :name:: Kind of task
     #   :params:: Custom parameters given to the execution (parsed back from JSON)
+    #   :run_id:: The workflow execution's run ID
     #   :version:: Client version
+    #   :workflow_id:: The workflow execution's workflow ID
     #
     #   See {Ntswf::Client#start_execution}'s options for details
     # @param proc [Proc] The callback
@@ -54,7 +56,12 @@ module Ntswf
     protected
 
     def describe(activity_task)
-      options = parse_input(activity_task.input).merge(activity_task: activity_task)
+      options = parse_input(activity_task.input)
+      options.merge!(
+        activity_task: activity_task,
+        run_id: activity_task.workflow_execution.run_id,
+        workflow_id: activity_task.workflow_execution.workflow_id,
+      )
       options.map { |k, v| {k.to_sym => v} }.reduce(&:merge!)
     end
 

data/lib/ntswf/decision_worker.rb

@@ -35,29 +35,35 @@ module Ntswf
     def process_decision_event(task, event)
       log("processing event #{event.inspect}")
       case event.event_type
-      when 'WorkflowExecutionStarted'
-        schedule(task, event)
-      when 'TimerFired'
-        retry_or_continue_as_new(task, task.events.first)
-      when 'ActivityTaskCompleted'
-        result = parse_result(event.attributes.result)
-        start_timer(task, result["seconds_until_retry"]) or task.complete_workflow_execution(
-            result: event.attributes.result)
-      when 'ActivityTaskFailed'
-        if (event.attributes.reason == RETRY)
-          schedule(task, task.events.first)
-        else
-          start_timer(task) or task.fail_workflow_execution(
-              event.attributes.to_h.keep_if {|k| [:details, :reason].include? k})
-        end
-      when 'ActivityTaskTimedOut'
-        notify("Timeout in Simple Workflow. Possible cause: all workers busy",
-            workflow_execution: task.workflow_execution.inspect)
-        start_timer(task) or task.cancel_workflow_execution(
-            details: 'activity task timeout')
+      when 'WorkflowExecutionStarted' then schedule(task, event)
+      when 'TimerFired' then retry_or_continue_as_new(task, task.events.first)
+      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)
       end
     end
 
+    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)
+    end
+
+    def activity_task_failed(task, event)
+      if (event.attributes.reason == RETRY)
+        schedule(task, task.events.first)
+      else
+        start_timer(task) or task.fail_workflow_execution(
+            event.attributes.to_h.keep_if {|k| [:details, :reason].include? k})
+      end
+    end
+
+    def activity_task_timed_out(task, event)
+      notify("Timeout in Simple Workflow. Possible cause: all workers busy",
+          workflow_execution: task.workflow_execution.inspect)
+      start_timer(task) or task.cancel_workflow_execution(details: 'activity task timeout')
+    end
+
     def start_timer(task, interval = nil)
       unless interval
         options = parse_input(task.events.first.attributes.input)

metadata

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