Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-163-Update-node-state-for-stub-tasks e0509d9c4 -> 8c8eb1581
renamed the markertask back to StubTask Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8c8eb158 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8c8eb158 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8c8eb158 Branch: refs/heads/ARIA-163-Update-node-state-for-stub-tasks Commit: 8c8eb1581756ef2deeeb72b4dcad250434e563f5 Parents: e0509d9 Author: max-orlov <[email protected]> Authored: Mon May 1 11:54:49 2017 +0300 Committer: max-orlov <[email protected]> Committed: Mon May 1 11:54:49 2017 +0300 ---------------------------------------------------------------------- aria/orchestrator/workflows/core/engine.py | 2 +- aria/orchestrator/workflows/core/task.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8c8eb158/aria/orchestrator/workflows/core/engine.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflows/core/engine.py b/aria/orchestrator/workflows/core/engine.py index 51531f1..a4498aa 100644 --- a/aria/orchestrator/workflows/core/engine.py +++ b/aria/orchestrator/workflows/core/engine.py @@ -112,7 +112,7 @@ class Engine(logger.LoggerMixin): @staticmethod def _handle_executable_task(task): - if not isinstance(task, engine_task.MarkerTaskBase): + if not isinstance(task, engine_task.StubTask): events.sent_task_signal.send(task) task.execute() http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8c8eb158/aria/orchestrator/workflows/core/task.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflows/core/task.py b/aria/orchestrator/workflows/core/task.py index 4a0b862..181e47b 100644 --- a/aria/orchestrator/workflows/core/task.py +++ b/aria/orchestrator/workflows/core/task.py @@ -64,13 +64,13 @@ class BaseTask(object): return self._id -class MarkerTaskBase(BaseTask): +class StubTask(BaseTask): """ Base stub task for marker user tasks that only mark the start/end of a workflow or sub-workflow """ def __init__(self, *args, **kwargs): - super(MarkerTaskBase, self).__init__(executor=dry.MarkerExecutor(), *args, **kwargs) + super(StubTask, self).__init__(executor=dry.MarkerExecutor(), *args, **kwargs) self.status = models.Task.PENDING self.due_at = datetime.utcnow() self.started_at = None @@ -91,28 +91,28 @@ class MarkerTaskBase(BaseTask): self.status = models.Task.STARTED -class StartWorkflowTask(MarkerTaskBase): +class StartWorkflowTask(StubTask): """ Task marking a workflow start """ pass -class EndWorkflowTask(MarkerTaskBase): +class EndWorkflowTask(StubTask): """ Task marking a workflow end """ pass -class StartSubWorkflowTask(MarkerTaskBase): +class StartSubWorkflowTask(StubTask): """ Task marking a subworkflow start """ pass -class EndSubWorkflowTask(MarkerTaskBase): +class EndSubWorkflowTask(StubTask): """ Task marking a subworkflow end """
