Merge remote-tracking branch 'origin/master' into 2044-share-button

[arvados.git] / services / api / app / models / pipeline_instance.rb

diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 24253bf0ae7539499d8d4bd1f12df89b05e6adb9..7bb814c60d4a902d15a61485952ead0437a96cbe 100644 (file)
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -1,5 +1,5 @@
 class PipelineInstance < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   serialize :components, Hash
@@ -166,7 +166,7 @@ class PipelineInstance < ArvadosModel
         return false
       end
     elsif 'success'.in? changed_attributes
-      logger.info "pipeline_instance changed_attributes for success"
+      logger.info "pipeline_instance changed_attributes has success for #{self.uuid}"
       if self.success
         self.active = false
         self.state = Complete
@@ -175,7 +175,7 @@ class PipelineInstance < ArvadosModel
         self.state = Failed
       end
     elsif 'active'.in? changed_attributes
-      logger.info "pipeline_instance changed_attributes for active"
+      logger.info "pipeline_instance changed_attributes has active for #{self.uuid}"
       if self.active
         if self.state.in? [New, Ready, Paused]
           self.state = RunningOnServer
@@ -196,8 +196,8 @@ class PipelineInstance < ArvadosModel
     end
 
     if new_record? or 'components'.in? changed_attributes
-      state ||= New
-      if state == New and self.components_look_ready?
+      self.state ||= New
+      if self.state == New and self.components_look_ready?
         self.state = Ready
       end
     end