ariatosca-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject incubator-ariatosca git commit: removed unnecessary cli options and helptexts; renamed ExcThread to ExceptionThread
Date Thu, 30 Mar 2017 17:01:44 GMT
Repository: incubator-ariatosca
Updated Branches:
  refs/heads/ARIA-48-aria-cli b0a408f23 -> dbf4cbb07


removed unnecessary cli options and helptexts; renamed ExcThread to ExceptionThread


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/dbf4cbb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/dbf4cbb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/dbf4cbb0

Branch: refs/heads/ARIA-48-aria-cli
Commit: dbf4cbb076dec61ac529caed5c76a7bccab3efe3
Parents: b0a408f
Author: Ran Ziv <ran@gigaspaces.com>
Authored: Thu Mar 30 20:01:38 2017 +0300
Committer: Ran Ziv <ran@gigaspaces.com>
Committed: Thu Mar 30 20:01:38 2017 +0300

----------------------------------------------------------------------
 aria/cli/cli/aria.py            | 19 -------------------
 aria/cli/cli/helptexts.py       |  9 ---------
 aria/cli/commands/executions.py |  1 +
 aria/utils/threading.py         |  4 ++--
 4 files changed, 3 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dbf4cbb0/aria/cli/cli/aria.py
----------------------------------------------------------------------
diff --git a/aria/cli/cli/aria.py b/aria/cli/cli/aria.py
index bec0242..baa72eb 100644
--- a/aria/cli/cli/aria.py
+++ b/aria/cli/cli/aria.py
@@ -299,16 +299,6 @@ class Options(object):
             callback=inputs_callback,
             help=helptexts.INPUTS)
 
-        self.output_path = click.option(
-            '-o',
-            '--output-path',
-            help=helptexts.OUTPUT_PATH)
-
-        self.optional_output_path = click.option(
-            '-o',
-            '--output-path',
-            help=helptexts.OUTPUT_PATH)
-
         self.json_output = click.option(
             '--json-output',
             is_flag=True,
@@ -412,15 +402,6 @@ class Options(object):
             help=helptexts.TASK_RETRY_INTERVAL.format(default))
 
     @staticmethod
-    def timeout(default=900):
-        #TODO needed?
-        return click.option(
-            '--timeout',
-            type=int,
-            default=default,
-            help=helptexts.OPERATION_TIMEOUT)
-
-    @staticmethod
     def service_id(required=False):
         return click.option(
             '-s',

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dbf4cbb0/aria/cli/cli/helptexts.py
----------------------------------------------------------------------
diff --git a/aria/cli/cli/helptexts.py b/aria/cli/cli/helptexts.py
index de1e789..02519cb 100644
--- a/aria/cli/cli/helptexts.py
+++ b/aria/cli/cli/helptexts.py
@@ -29,12 +29,9 @@ SERVICE_TEMPLATE_ID = "The unique identifier for the service template"
 
 RESET_CONTEXT = "Reset the working environment"
 HARD_RESET = "Hard reset the configuration, including coloring and loggers"
-SHOW_ACTIVE_CONNECTION_INFORMATION = \
-    "Show connection information for the active manager"
 ENABLE_COLORS = "Enable colors in logger (use --hard when working with" \
                 " an initialized environment) [default: False]"
 
-OUTPUT_PATH = "The local path to download to"
 SERVICE_TEMPLATE_FILENAME = (
     "The name of the archive's main service template file. "
     "This is only relevant if uploading an archive")
@@ -44,13 +41,7 @@ TASK_RETRY_INTERVAL = \
     "How long of a minimal interval should occur between task retry attempts [default: {0}]"
 TASK_MAX_ATTEMPTS = \
     "How many times should a task be attempted in case of failures [default: {0}]"
-TASK_THREAD_POOL_SIZE = \
-    "The size of the thread pool to execute tasks in [default: {0}]"
 
-OPERATION_TIMEOUT = (
-    "Operation timeout in seconds (The execution itself will keep going, but "
-    "the CLI will stop waiting for it to terminate) [default: {0}]"
-)
 JSON_OUTPUT = "Output events in a consumable JSON format"
 
 SERVICE_ID = "The unique identifier for the service"

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dbf4cbb0/aria/cli/commands/executions.py
----------------------------------------------------------------------
diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py
index d978612..d767fa1 100644
--- a/aria/cli/commands/executions.py
+++ b/aria/cli/commands/executions.py
@@ -152,6 +152,7 @@ def start(workflow_name,
     except KeyboardInterrupt:
         _cancel_execution(workflow_runner, execution_thread, logger)
 
+    # raise any errors from the execution thread (note these are not workflow execution errors)
     execution_thread.raise_error_if_exists()
 
     execution = workflow_runner.execution

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/dbf4cbb0/aria/utils/threading.py
----------------------------------------------------------------------
diff --git a/aria/utils/threading.py b/aria/utils/threading.py
index 9c84461..f4e9c0e 100644
--- a/aria/utils/threading.py
+++ b/aria/utils/threading.py
@@ -258,7 +258,7 @@ class LockedList(list):
         return self.lock.__exit__(the_type, value, traceback)
 
 
-class ExcThread(Thread):
+class ExceptionThread(Thread):
     """
     A thread from which top level exceptions can be retrieved or reraised
     """
@@ -268,7 +268,7 @@ class ExcThread(Thread):
 
     def run(self):
         try:
-            super(ExcThread, self).run()
+            super(ExceptionThread, self).run()
         except BaseException:
             self.exception = sys.exc_info()
 


Mime
View raw message