foreman-tasks 0.2.1 → 0.2.2

data/app/models/foreman_tasks/concerns/action_subject.rb

@@ -12,7 +12,6 @@ module ForemanTasks
         after_create :plan_create_action
         after_update :plan_update_action
         after_destroy :plan_destroy_action
-        after_commit :execute_planned_action
       end
 
       module ClassMethods
@@ -97,11 +96,50 @@ module ForemanTasks
       # we want to be able to rollback the whole db operation when planning fails.
       def plan_action(action_class, *args)
         @execution_plan = ::ForemanTasks.dynflow.world.plan(action_class, *args)
-        planned         = @execution_plan.state == :planned
-        unless planned
-          errors = @execution_plan.steps.values.map(&:error).compact
-          # we raise error so that the whole transaction is rollbacked
-          raise errors.map(&:message).join('; ')
+        raise @execution_plan.errors.first if @execution_plan.error?
+      end
+
+      def save(*)
+        dynflow_task_wrap(:save) { super }
+      end
+
+      def save!(*)
+        dynflow_task_wrap(:save) { super }
+      end
+
+      def destroy
+        dynflow_task_wrap(:destroy) { super }
+      end
+
+      # Makes sure the execution plan is executed AFTER the transaction is commited.
+      # We can't user after_commit filters because they don't allow to raise
+      # exceptions in there, so we would not be able to report that something
+      # went wrong when running a sync_task.:
+      #
+      #   http://guides.rubyonrails.org/v3.2.14/active_record_validations_callbacks.html#transaction-callbacks
+      #
+      # That's why we need to override save and destroy methods instead.
+      # Another reason why one should avoid callbacks for orchestration.
+      #
+      # Also, it makes sure the save is not run inside other transaction because
+      # we would start the execution phase inside this transaction which would lead
+      # to unexpected results.
+      def dynflow_task_wrap(method)
+        action = case method
+                 when :save
+                   self.new_record? ? create_action : update_action
+                 when :destroy
+                   destroy_action
+                 else
+                   raise 'unexpected method'
+                 end
+        if action
+          if self.class.connection.open_transactions > 0
+            raise "Executing dynflow action inside a transaction is not a good idea"
+          end
+          yield.tap { |result| execute_planned_action if result }
+        else
+          yield
         end
       end
 
@@ -109,7 +147,13 @@ module ForemanTasks
       def execute_planned_action
         if @execution_plan
           run = ::ForemanTasks.dynflow.world.execute(@execution_plan.id)
-          run.finished.wait if @dynflow_sync_action
+          if @dynflow_sync_action
+            run.wait
+            if run.value.error?
+              task = ForemanTasks::Task::DynflowTask.find_by_external_id!(@execution_plan.id)
+              raise ForemanTasks::TaskError.new(task)
+            end
+          end
         end
         return true
       end

data/lib/foreman_tasks.rb

@@ -1,4 +1,5 @@
 require 'foreman_tasks/version'
+require 'foreman_tasks/task_error'
 require 'foreman_tasks/engine'
 require 'foreman_tasks/dynflow'
 require 'foreman_tasks/triggers'
@@ -34,8 +35,8 @@ module ForemanTasks
   end
 
   def self.sync_task(action, *args, &block)
-    # TODO raise aggregation error when there are failed run-steps
-    trigger_task false, action, *args, &block
+    trigger_task(false, action, *args, &block).tap do |task|
+      raise TaskError.new(task) if task.execution_plan.error?
+    end
   end
-
 end

data/lib/foreman_tasks/task_error.rb

@@ -0,0 +1,19 @@
+module ForemanTasks
+  class TaskError < StandardError
+
+    attr_reader :task
+    attr_reader :errors
+
+    def initialize(task)
+      @task = task
+      @errors = task.execution_plan.steps.values.map(&:error).compact
+      super(aggregated_message)
+    end
+
+    def aggregated_message
+      "Task #{task.id}: " +
+          errors.map { |e| "#{e.exception_class}: #{e.message}" }.join('; ')
+    end
+
+  end
+end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -156,6 +156,7 @@ files:
 - lib/foreman_tasks/engine.rb
 - lib/foreman_tasks/version.rb
 - lib/foreman_tasks/triggers.rb
+- lib/foreman_tasks/task_error.rb
 - lib/foreman_tasks/dynflow/configuration.rb
 - lib/foreman_tasks/dynflow/persistence.rb
 - lib/foreman_tasks/dynflow/daemon.rb