Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C5502200C73 for ; Tue, 25 Apr 2017 18:24:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C437A160B9E; Tue, 25 Apr 2017 16:24:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E65E1160BB8 for ; Tue, 25 Apr 2017 18:24:11 +0200 (CEST) Received: (qmail 25853 invoked by uid 500); 25 Apr 2017 16:24:11 -0000 Mailing-List: contact dev-help@ariatosca.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ariatosca.incubator.apache.org Delivered-To: mailing list dev@ariatosca.incubator.apache.org Received: (qmail 25817 invoked by uid 99); 25 Apr 2017 16:24:10 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2017 16:24:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 7FE741A02C7 for ; Tue, 25 Apr 2017 16:24:10 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.02 X-Spam-Level: X-Spam-Status: No, score=-4.02 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 6gSWbpA6qOdl for ; Tue, 25 Apr 2017 16:24:09 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id EF32360CF6 for ; Tue, 25 Apr 2017 16:24:06 +0000 (UTC) Received: (qmail 24172 invoked by uid 99); 25 Apr 2017 16:24:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2017 16:24:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CECF0DFBC7; Tue, 25 Apr 2017 16:24:05 +0000 (UTC) From: mxmrlv To: dev@ariatosca.incubator.apache.org Reply-To: dev@ariatosca.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-ariatosca pull request #109: ARIA-146-Support-colorful-execution-l... Content-Type: text/plain Message-Id: <20170425162405.CECF0DFBC7@git1-us-west.apache.org> Date: Tue, 25 Apr 2017 16:24:05 +0000 (UTC) archived-at: Tue, 25 Apr 2017 16:24:13 -0000 Github user mxmrlv commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/109#discussion_r113234319 --- 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: { + SUCCESS_STATE: Color.Fore.GREEN, + CANCEL_STATE: Color.Fore.YELLOW, + FAIL_STATE: Color.Fore.RED, + } } +_PATTERNS = { + SUCCESS_STATE: re.compile(_SUCCESSFUL_EXECUTION_PATTERN), + CANCEL_STATE: re.compile(_CANCELED_EXECUTION_PATTERN), + FAIL_STATE: re.compile(_FAILED_EXECUTION_PATTERN) + +} + + +class _StylizedLogs(object): + + def __init__(self): + self._formats = DEFAULT_FORMATTING + self._styles = DEFAULT_STYLING + self._mark_pattern = None + + def _push(self, styles=None, formats=None, mark_pattern=None): --- End diff -- remove --- 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 infrastructure@apache.org or file a JIRA ticket with INFRA. ---