2955: Renamed script to "cancel_stale_jobs". Fixed spelling canceled_at -> cancelled_at.

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 29052f8fc3d7fe4a364fddaacfce46f8be664b4b..e9b3f00b61e84004a2820cedb6f472e96126c3b2 100755 (executable)
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -578,7 +578,7 @@ class WhRunPipelineInstance
     failed = 0
     @components.each do |cname, c|
       if c[:job]
-        if c[:job][:finished_at] or c[:job][:canceled_at] or (c[:job][:running] == false and c[:job][:success] == false)
+        if c[:job][:finished_at] or c[:job][:cancelled_at] or (c[:job][:running] == false and c[:job][:success] == false)
           ended += 1
           if c[:job][:success] == true
             succeeded += 1

diff --git a/services/api/script/clean_orphan_jobs.rb b/services/api/script/cancel_stale_jobs.rb
similarity index 96%
rename from services/api/script/clean_orphan_jobs.rb
rename to services/api/script/cancel_stale_jobs.rb
index 35673c3ccbe283fdd70979a55866e5973149cb8b..dde4cbed0cf6b78eaf973a7f77f40d0b2333c071 100755 (executable)
--- a/services/api/script/clean_orphan_jobs.rb
+++ b/services/api/script/cancel_stale_jobs.rb
@@ -13,7 +13,7 @@ ENV["RAILS_ENV"] = ARGV[0] || ENV["RAILS_ENV"] || "development"
 require File.dirname(__FILE__) + '/../config/boot'
 require File.dirname(__FILE__) + '/../config/environment'
 
-def refresh_running
+def cancel_stale_jobs
   Job.running.each do |jobrecord|
     f = Log.where("object_uuid=?", jobrecord.uuid).limit(1).order("created_at desc").first
     if f
@@ -34,4 +34,4 @@ def refresh_running
   end
 end
 
-refresh_running
+cancel_stale_jobs