From f1e2fdbfaa4f18c662a75941437d1ae46c6ca89f Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Mon, 6 Nov 2017 08:35:00 +0100
Subject: Refactor: how a pipeline step is finished

---
 ick2/controllerapi.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'ick2/controllerapi.py')

diff --git a/ick2/controllerapi.py b/ick2/controllerapi.py
index 1fea9a0..a7d5fb5 100644
--- a/ick2/controllerapi.py
+++ b/ick2/controllerapi.py
@@ -380,15 +380,25 @@ class WorkAPI(APIbase):
         project, pipeline = self._get_pipeline(
             update['project'], update['pipeline'])
 
+        ick2.log.log(
+            'trace',
+            msg_text='xxx update_work',
+            update=update,
+            project=project,
+            pipeline=pipeline,
+            doing=doing)
+
         if update.get('exit_code') == 0:
+            ick2.log.log('trace', msg_texg='xxx finishing step')
             index = doing['step_index'] + 1
             actions = pipeline['actions']
             if index >= len(actions):
-                self._finish_pipeline(project, pipeline)
+                pipeline['status'] = 'idle'
                 doing = {}
             else:
                 doing['step_index'] = index
                 doing['step'] = actions[index]
+            self._update_project(project)
 
             worker_state = {
                 'worker': update['worker'],
@@ -414,10 +424,6 @@ class WorkAPI(APIbase):
                     return p, pl
         raise ick2.NotFound()
 
-    def _finish_pipeline(self, project, pipeline):
-        pipeline['status'] = 'idle'
-        self._update_project(project)
-
     def create(self, *args, **kwargs):  # pragma: no cover
         pass
 
-- 
cgit v1.2.1