- Made a note about intentionally not setting "success"

- Changed if c[:job][:success] == false to elsif
- Changed == nil to .nil?
- Removed whitespace

diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index 67fdd5f650bd850ad468fb86ec858bef94085d38..1e62a52c04dcf9edbd9106a42d9c2124d07967e3 100755 (executable)
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -558,8 +558,7 @@ class WhRunPipelineInstance
           ended += 1
           if c[:job][:success] == true
             succeeded += 1
-          end
-          if c[:job][:success] == false
+          elsif c[:job][:success] == false
             failed += 1
           end
         end

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index a54e8acf726c55e91d98f54874674988f02d80a4..36358460303c8d806569367c76a158421b4c1563 100755 (executable)
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -309,12 +309,9 @@ class Dispatcher
     j_done[:wait_thr].value
 
     jobrecord = Job.find_by_uuid(job_done.uuid)
-    jobrecord.running = false
-    if jobrecord.finished_at == nil
-      jobrecord.finished_at = Time.now
-    end
+    jobrecord.assert_finished
     jobrecord.save!
-    
+
     # Invalidate the per-job auth token
     j_done[:job_auth].update_attributes expires_at: Time.now
 
@@ -368,8 +365,6 @@ class Dispatcher
     end
   end
 
-
-
   protected
 
   def did_recently(thing, min_interval)