dynflow 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35bd7c7bd52da4f68946edb03d5d388d09f53cea
-  data.tar.gz: 35800095dee5a7edc92ed87d605edc66e8190c34
+  metadata.gz: a92e48caa3237c278bd91fe10690740859ae29fc
+  data.tar.gz: 79b17f3f3119f954c58e6d2544f3a9725d51778d
 SHA512:
-  metadata.gz: 2415804bf8a2c1a0b502db7bf685915aa7ae90365bd3316db269bdd187fa0d98357e1452181f23cbcf779c495fa4293046336a5ae700926b59566d9f47fe0187
-  data.tar.gz: 9fb0b84f75bcc2055d523d61a706393eeb14479ce5939b73ec0d3b242aaf888c3a129a561acea88b598bcf3954b99deae3ea4919eede8b04f729e33b3dc6b528
+  metadata.gz: 58e2dab7d4634009ba158642d3959c60e2633d9ebdbe3b0c6afaa3c3b9f338868fb788e0ec4c55a9bc66032ff2e420375e496bc1c77c970edde83a57c965fe77
+  data.tar.gz: d9f22b6954465c5c08f9a0f9fdd059e8a9e4ebeb04f21ee2791b27597edf2b5697f7b7ee4926412b85d9095d29ff6e4c47a8258d03252745af0f2d25b9d1f233

data/lib/dynflow/delayed_plan.rb

@@ -37,7 +37,10 @@ module Dynflow
     end
 
     def cancel
-      error("Delayed task cancelled", "Delayed task cancelled")
+      execution_plan.root_plan_step.state = :cancelled
+      execution_plan.root_plan_step.save
+      execution_plan.execution_history.add "Delayed task cancelled", @world.id
+      execution_plan.update_state :stopped
       @world.persistence.delete_delayed_plans(:execution_plan_uuid => @execution_plan_uuid)
       return true
     end

data/lib/dynflow/execution_plan.rb

@@ -54,7 +54,7 @@ module Dynflow
     require 'dynflow/execution_plan/hooks'
 
     def self.results
-      @results ||= [:pending, :success, :warning, :error]
+      @results ||= [:pending, :success, :warning, :error, :cancelled]
     end
 
     def self.state_transitions
@@ -148,7 +148,9 @@ module Dynflow
 
     def result
       all_steps = steps.values
-      if all_steps.any? { |step| step.state == :error }
+      if all_steps.any? { |step| step.state == :cancelled }
+        return :cancelled
+      elsif all_steps.any? { |step| step.state == :error }
         return :error
       elsif all_steps.any? { |step| [:skipping, :skipped].include?(step.state) }
         return :warning

data/lib/dynflow/execution_plan/steps/abstract.rb

@@ -68,7 +68,7 @@ module Dynflow
       end
 
       def self.states
-        @states ||= [:scheduling, :pending, :running, :success, :suspended, :skipping, :skipped, :error]
+        @states ||= [:scheduling, :pending, :running, :success, :suspended, :skipping, :skipped, :error, :cancelled]
       end
 
       def execute(*args)

data/lib/dynflow/execution_plan/steps/plan_step.rb

@@ -59,12 +59,13 @@ module Dynflow
       end
 
       def self.state_transitions
-        @state_transitions ||= { scheduling: [:pending, :error],
-                                 pending:    [:running, :error],
-                                 running:    [:success, :error],
+        @state_transitions ||= { scheduling: [:pending, :error, :cancelled],
+                                 pending:    [:running, :error, :cancelled],
+                                 running:    [:success, :error, :cancelled],
                                  success:    [],
                                  suspended:  [],
                                  skipped:    [],
+                                 cancelled:  [],
                                  error:      [] }
       end
 

data/lib/dynflow/rails/daemon.rb

@@ -81,7 +81,8 @@ module Dynflow
               run(options[:rails_root], options)
             rescue => e
               STDERR.puts e.message
-              ::Rails.logger.exception('Failed running Dynflow daemon', e)
+              ::Rails.logger.fatal('Failed running Dynflow daemon')
+              ::Rails.logger.fatal(e)
               exit 1
             end
           end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/lib/dynflow/web/console_helpers.rb

@@ -131,6 +131,8 @@ module Dynflow
           "success"
         when :error
           "danger"
+        when :cancelled
+          "warning"
         else
           "default"
         end

data/test/future_execution_test.rb

@@ -64,7 +64,7 @@ module Dynflow
           execution_plan.cancel.each(&:wait)
           execution_plan = world.persistence.load_execution_plan(self.execution_plan.id)
           execution_plan.state.must_equal :stopped
-          execution_plan.result.must_equal :error
+          execution_plan.result.must_equal :cancelled
           assert_nil execution_plan.delay_record
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json