patriot-workflow-scheduler 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171fc8719f6d43b4923df7c7f6441d9953aba4c9
-  data.tar.gz: 1c21f08807b6bf8b5ffee473184cbc972323d75e
+  metadata.gz: a1a0c82d488ca21482f0eac998eb52d2ee2106a3
+  data.tar.gz: 13b172098a71882b0d67f140689da8cd29e626b4
 SHA512:
-  metadata.gz: e6cf0a2084f683b914c01107e3884e61ad79ee0038f93dd5febe848e11a181d11692837e791ee5b441cd22fe98f4de6242db7379a29b753bca643f097e5221a1
-  data.tar.gz: f56e71de2572befe76194efe4a89e2f8874dcac4443ef12c5495ebbfef007a16df17710722e81b15bb2e688755b27f2a7709c3183c5143c56be92b79e5b73e1f
+  metadata.gz: 67cac5df84115fab0fd04257697090e92cb704773513120e2f135943770ebbe4f7d16c1cafb365ffd6cfbaa9483916c7a1876ee70547e43fcef71b721d177576
+  data.tar.gz: 74786b07ec16e0c73bf46d0874648ab72b56a61864751ac2ad041f9c18294129c085c6b1f88d92e6f08b594dec077896531cb9857f872e28c930bb3f30c8e60f

data/lib/patriot/command/post_processor/base.rb

@@ -32,15 +32,18 @@ module Patriot
 
         def process(cmd, worker, job_ticket)
           case job_ticket.exit_code
-          when Patriot::Command::ExitCode::SUCCEEDED then process_success(cmd, worker, job_ticket)
-          when Patriot::Command::ExitCode::FAILED    then process_failure(cmd, worker, job_ticket)
+          when Patriot::Command::ExitCode::SUCCEEDED then return process_success(cmd, worker, job_ticket)
+          when Patriot::Command::ExitCode::FAILED    then return process_failure(cmd, worker, job_ticket)
           end
+          return true
         end
 
         def process_success(cmd, worker, job_ticket)
+          return true
         end
 
         def process_failure(cmd, worker, job_ticket)
+          return true
         end
 
       end

data/lib/patriot/command/post_processor/discard_on_fail.rb

@@ -8,6 +8,7 @@ module Patriot
 
         def process_failure(cmd, worker, job_ticket)
           worker.job_store.set_state(Time.now.to_i, [cmd.job_id], Patriot::JobStore::JobState::DISCARDED)
+          return true
         end
 
       end

data/lib/patriot/command/post_processor/http_notification.rb

@@ -29,6 +29,7 @@ module Patriot
           when Patriot::Command::ExitCode::SUCCEEDED then send_callback(job_ticket.job_id, callback_url, "SUCCEEDED")
           when Patriot::Command::ExitCode::FAILED then send_callback(job_ticket.job_id, callback_url, "FAILED")
           end
+          return true
         end
 
         def send_callback(job_id, callback_url, state)

data/lib/patriot/command/post_processor/mail_notification.rb

@@ -24,6 +24,7 @@ module Patriot
           when Patriot::Command::ExitCode::SUCCEEDED then process_success(cmd, worker, job_ticket)
           when Patriot::Command::ExitCode::FAILED    then process_failure(cmd, worker, job_ticket)
           end
+          return true
         end
 
         def process_success(cmd, worker, job_ticket)

data/lib/patriot/command/post_processor/retrial.rb

@@ -21,7 +21,7 @@ module Patriot
             found = true
             # count first attempt in
             pp.props[COUNT_PROP_KEY] = pp.props[COUNT_PROP_KEY] - 1
-            return if pp.props[COUNT_PROP_KEY] == 0
+            return true if pp.props[COUNT_PROP_KEY] < 1
             cmd.start_datetime = Time.now + pp.props[INTERVAL_PROP_KEY]
           end
           job = cmd.to_job
@@ -30,6 +30,7 @@ module Patriot
           job[Patriot::Command::REQUISITES_ATTR] = current_config[Patriot::Command::REQUISITES_ATTR]
           job[Patriot::Command::STATE_ATTR] = Patriot::JobStore::JobState::WAIT
           worker.job_store.register(Time.now.to_i, [job])
+          return false
         end
 
       end

data/lib/patriot/command/post_processor/skip_on_fail.rb

@@ -8,6 +8,7 @@ module Patriot
 
         def process_failure(cmd, worker, job_ticket)
           worker.job_store.set_state(Time.now.to_i, [cmd.job_id], Patriot::JobStore::JobState::SUCCEEDED)
+          return true
         end
 
       end

data/lib/patriot/version.rb

@@ -1,3 +1,3 @@
 module Patriot
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/lib/patriot/worker/base.rb

@@ -85,10 +85,15 @@ module Patriot
             @logger.error job_store_error
           end
           unless command.post_processors.nil?
+            continue_post_processing = true
             command.post_processors.each do |pp|
               begin
-                @logger.info "executing post process by #{pp}"
-                pp.process(command, self, job_ticket)
+                if continue_post_processing
+                  @logger.info "executing post process by #{pp}"
+                  continue_post_processing = continue_post_processing && pp.process(command, self, job_ticket)
+                else
+                  @logger.info "skipping post process by #{pp}"
+                end
               rescue Exception => post_process_error
                 @logger.error "post process by #{pp} failed"
                 @logger.error post_process_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patriot-workflow-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Teruyoshi Zenmyo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport