You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ariatosca.apache.org by mx...@apache.org on 2017/05/25 08:51:36 UTC
incubator-ariatosca git commit: added closing and removed daemon
thread
Repository: incubator-ariatosca
Updated Branches:
refs/heads/ARIA-258-Convert-runtime-properties-to-attributes 0b96ec126 -> b597b94db
added closing and removed daemon thread
Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/b597b94d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/b597b94d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/b597b94d
Branch: refs/heads/ARIA-258-Convert-runtime-properties-to-attributes
Commit: b597b94db90295d827c46f8bac6951975c5c3e03
Parents: 0b96ec1
Author: max-orlov <ma...@gigaspaces.com>
Authored: Thu May 25 11:48:35 2017 +0300
Committer: max-orlov <ma...@gigaspaces.com>
Committed: Thu May 25 11:48:35 2017 +0300
----------------------------------------------------------------------
aria/orchestrator/execution_plugin/ctx_proxy/server.py | 1 -
aria/orchestrator/workflows/executor/process.py | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b597b94d/aria/orchestrator/execution_plugin/ctx_proxy/server.py
----------------------------------------------------------------------
diff --git a/aria/orchestrator/execution_plugin/ctx_proxy/server.py b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
index 1ce0e08..102ff9a 100644
--- a/aria/orchestrator/execution_plugin/ctx_proxy/server.py
+++ b/aria/orchestrator/execution_plugin/ctx_proxy/server.py
@@ -98,7 +98,6 @@ class CtxProxy(object):
quiet=True,
server=BottleServerAdapter)
thread = threading.Thread(target=serve)
- thread.daemon = True
thread.start()
return thread
http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/b597b94d/aria/orchestrator/workflows/executor/process.py
----------------------------------------------------------------------
diff --git a/aria/orchestrator/workflows/executor/process.py b/aria/orchestrator/workflows/executor/process.py
index 43bcced..f02e0a6 100644
--- a/aria/orchestrator/workflows/executor/process.py
+++ b/aria/orchestrator/workflows/executor/process.py
@@ -307,11 +307,11 @@ def _main():
for decorate in process_executor.decorate():
task_func = decorate(task_func)
task_func(ctx=ctx, **operation_inputs)
+ ctx.close()
messenger.succeeded()
except BaseException as e:
- messenger.failed(e)
- finally:
ctx.close()
+ messenger.failed(e)
if __name__ == '__main__':
_main()