Github user mxmrlv commented on a diff in the pull request:
https://github.com/apache/incubator-ariatosca/pull/109#discussion_r113227509
--- Diff: aria/cli/execution_logging.py ---
@@ -12,62 +12,208 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
+import os
+import re
from StringIO import StringIO
+from contextlib import contextmanager
from . import logger
+from .color import Color
from .env import env
+
+LEVEL = 'level'
+TIMESTAMP = 'timestamp'
+MESSAGE = 'message'
+IMPLEMENTATION = 'implementation'
+INPUTS = 'inputs'
+TRACEBACK = 'traceback'
+MARKER = 'marker'
+
+FINAL_STATES = 'final_states'
+SUCCESS_STATE = 'success'
+CANCEL_STATE = 'cancel'
+FAIL_STATE = 'fail'
+
+
+_EXECUTION_BASE_PATTERN = "\'.*\' workflow execution "
+_SUCCESSFUL_EXECUTION_PATTERN = _EXECUTION_BASE_PATTERN + "succeeded"
+_FAILED_EXECUTION_PATTERN = _EXECUTION_BASE_PATTERN + "failed"
+_CANCELED_EXECUTION_PATTERN = _EXECUTION_BASE_PATTERN + "canceled"
+
DEFAULT_FORMATTING = {
- logger.NO_VERBOSE: {'message': '{item.msg}'},
+ logger.NO_VERBOSE: {'message': '{message}'},
logger.LOW_VERBOSE: {
- 'message': '{timestamp} | {item.level[0]} | {item.msg}',
- 'timestamp': '%H:%M:%S'
+ MESSAGE: '{timestamp} | {level} | {message}',
+ LEVEL: '{level[0]}',
+ TIMESTAMP: '%H:%M:%S',
},
logger.MEDIUM_VERBOSE: {
- 'message': '{timestamp} | {item.level[0]} | {implementation} |
{item.msg} ',
- 'timestamp': '%H:%M:%S'
+ MESSAGE: '{timestamp} | {level} | {implementation} | {message} ',
+ LEVEL: '{level[0]}',
+ TIMESTAMP: '%H:%M:%S'
},
logger.HIGH_VERBOSE: {
- 'message': '{timestamp} | {item.level[0]} |
{implementation}({inputs}) | {item.msg} ',
- 'timestamp': '%H:%M:%S'
+ MESSAGE: '{timestamp} | {level} | {implementation} | {inputs} |
{message} ',
+ LEVEL: '{level[0]}',
+ TIMESTAMP: '%H:%M:%S'
+ },
+}
+
+DEFAULT_STYLING = {
+ LEVEL: {
+ 'info': Color.Fore.LIGHTMAGENTA_EX,
+ 'debug': Color.Schema(fore=Color.Fore.LIGHTMAGENTA_EX,
style=Color.Style.DIM),
+ 'error': Color.Schema(fore=Color.Fore.RED,
style=Color.Style.BRIGHT),
},
+ TIMESTAMP: {
+ 'info': Color.Fore.LIGHTMAGENTA_EX,
+ 'debug': Color.Schema(fore=Color.Fore.LIGHTMAGENTA_EX,
style=Color.Style.DIM),
+ 'error': Color.Schema(fore=Color.Fore.RED,
style=Color.Style.BRIGHT),
+ },
+ MESSAGE: {
+ 'info': Color.Fore.LIGHTBLUE_EX,
+ 'debug': Color.Schema(fore=Color.Fore.LIGHTBLUE_EX,
style=Color.Style.DIM),
+ 'error': Color.Schema(fore=Color.Fore.RED,
style=Color.Style.BRIGHT),
+ },
+ IMPLEMENTATION: {
+ 'info': Color.Fore.LIGHTBLACK_EX,
+ 'debug': Color.Schema(fore=Color.Fore.LIGHTBLACK_EX,
style=Color.Style.DIM),
+ 'error': Color.Schema(fore=Color.Fore.RED,
style=Color.Style.BRIGHT),
+ },
+ INPUTS: {
+ 'info': Color.Fore.BLUE,
+ 'debug': Color.Schema(fore=Color.Fore.BLUE, style=Color.Style.DIM),
+ 'error': Color.Schema(fore=Color.Fore.RED,
style=Color.Style.BRIGHT),
+ },
+ TRACEBACK: {'error': Color.Fore.RED},
+
+ MARKER: Color.Back.LIGHTYELLOW_EX,
+ FINAL_STATES: {
--- End diff --
extract somehow so this isnt configurable
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
