From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 4A25F1B1BB for ; Mon, 8 Jan 2018 10:56:26 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2018 01:56:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,330,1511856000"; d="scan'208";a="193209970" Received: from dpdk-test38.sh.intel.com ([10.67.119.87]) by fmsmga006.fm.intel.com with ESMTP; 08 Jan 2018 01:56:24 -0800 From: Marvin Liu To: dts@dpdk.org Cc: Marvin Liu Date: Sun, 7 Jan 2018 21:49:18 -0500 Message-Id: <1515379769-11553-6-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1515379769-11553-1-git-send-email-yong.liu@intel.com> References: <1515379769-11553-1-git-send-email-yong.liu@intel.com> Subject: [dts] [PATCH v1 05/16] framework/logger: optimize output format for child threads X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jan 2018 09:56:26 -0000 Signed-off-by: Marvin Liu diff --git a/framework/logger.py b/framework/logger.py index 1018674..78e90d6 100644 --- a/framework/logger.py +++ b/framework/logger.py @@ -35,7 +35,7 @@ import sys import inspect import re -from settings import LOG_NAME_SEP, FOLDERS +from settings import LOG_NAME_SEP, FOLDERS, load_global_setting, DTS_PARALLEL_SETTING from utils import RED """ @@ -87,10 +87,9 @@ logging.addLevelName(logging.SUITE_TESTER_OUTPUT, 'SUITE_TESTER_OUTPUT') logging.addLevelName(logging.DTS_IXIA_CMD, 'DTS_IXIA_CMD') logging.addLevelName(logging.DTS_IXIA_OUTPUT, 'DTS_IXIA_OUTPUT') -message_fmt = '%(asctime)s %(levelname)20s: %(message)s' date_fmt = '%d/%m/%Y %H:%M:%S' RESET_COLOR = '\033[0m' -stream_fmt = '%(color)s%(levelname)20s: %(message)s' + RESET_COLOR +stream_fmt = '%(color)s%(name)30s: %(message)s' + RESET_COLOR log_dir = None @@ -99,13 +98,6 @@ def set_verbose(): verbose = True -def add_salt(salt, msg): - if not salt: - return msg - else: - return '[%s] ' % salt + str(msg) - - class BaseLoggerAdapter(logging.LoggerAdapter): """ Upper layer of original logging module. @@ -212,8 +204,6 @@ class DTSLOG(BaseLoggerAdapter): self.crb = crb super(DTSLOG, self).__init__(self.logger, dict(crb=self.crb)) - self.salt = '' - self.fh = None self.ch = None @@ -226,6 +216,11 @@ class DTSLOG(BaseLoggerAdapter): """ Config stream handler and file handler. """ + if load_global_setting(DTS_PARALLEL_SETTING) == 'yes': + message_fmt = '%(asctime)s %(name)30s %(threadName)s: %(message)s' + else: + message_fmt = '%(asctime)s %(name)30s: %(message)s' + fh.setFormatter(logging.Formatter(message_fmt, date_fmt)) ch.setFormatter(logging.Formatter(stream_fmt, date_fmt)) @@ -251,28 +246,24 @@ class DTSLOG(BaseLoggerAdapter): """ DTS warnning level log function. """ - message = add_salt(self.salt, message) self.logger.log(self.warn_lvl, message) def info(self, message): """ DTS information level log function. """ - message = add_salt(self.salt, message) self.logger.log(self.info_lvl, message) def error(self, message): """ DTS error level log function. """ - message = add_salt(self.salt, message) self.logger.log(self.error_lvl, message) def debug(self, message): """ DTS debug level log function. """ - message = add_salt(self.salt, message) self.logger.log(self.debug_lvl, message) def set_logfile_path(self, path): @@ -304,34 +295,20 @@ class DTSLOG(BaseLoggerAdapter): ch = ColorHandler() self.__log_handler(fh, ch) - def set_salt(crb, start_flag): - if LOG_NAME_SEP in crb: - old = '%s%s' % (start_flag, LOG_NAME_SEP) - if not self.salt: - self.salt = crb.replace(old, '', 1) - if crb.startswith('dut'): self.info_lvl = logging.DTS_DUT_CMD self.debug_lvl = logging.DTS_DUT_OUTPUT self.warn_lvl = logging.DTS_DUT_RESULT - - set_salt(crb, 'dut') elif crb.startswith('tester'): self.info_lvl = logging.DTS_TESTER_CMD self.debug_lvl = logging.DTS_TESTER_OUTPUT self.warn_lvl = logging.DTS_TESTER_RESULT - - set_salt(crb, 'tester') elif crb.startswith('ixia'): self.info_lvl = logging.DTS_IXIA_CMD self.debug_lvl = logging.DTS_IXIA_OUTPUT - - set_salt(crb, 'ixia') elif crb.startswith('virtdut'): self.info_lvl = logging.DTS_VIRTDUT_CMD self.debug_lvl = logging.DTS_VIRTDUT_OUTPUT - - set_salt(crb, 'virtdut') else: self.error_lvl = logging.ERROR self.warn_lvl = logging.WARNING -- 1.9.3