X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Flog.py;h=b0fe037e1ba35e14d9ea8fd89a57a7e5aab8832a;hb=b4e5e50fe;hp=38610b7ee8b3241a603371eb83d4200097309f63;hpb=277b89c946e6fdc764ee48726fcd3df1c189eda9;p=vpp.git diff --git a/test/log.py b/test/log.py index 38610b7ee8b..b0fe037e1ba 100644 --- a/test/log.py +++ b/test/log.py @@ -1,13 +1,13 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import os import logging """ @var formatting delimiter consisting of '=' characters """ -double_line_delim = '=' * 70 +double_line_delim = '=' * 78 """ @var formatting delimiter consisting of '-' characters """ -single_line_delim = '-' * 70 +single_line_delim = '-' * 78 def colorize(msg, color): @@ -24,12 +24,6 @@ class ColorFormatter(logging.Formatter): if hasattr(record, 'color'): message = colorize(message, record.color) return message - -handler = logging.StreamHandler(sys.stdout) -handler.setFormatter(ColorFormatter()) - -global_logger = logging.getLogger() -global_logger.addHandler(handler) try: verbose = int(os.getenv("V", 0)) except: @@ -43,13 +37,33 @@ elif verbose == 1: else: log_level = 40 +handler = logging.StreamHandler(sys.stdout) +color_formatter = ColorFormatter(fmt='%(asctime)s,%(msecs)03d %(message)s', + datefmt="%H:%M:%S") +handler.setFormatter(color_formatter) +handler.setLevel(log_level) + +global_logger = logging.getLogger() +global_logger.addHandler(handler) + scapy_logger = logging.getLogger("scapy.runtime") scapy_logger.setLevel(logging.ERROR) -def getLogger(name): +def get_logger(name): logger = logging.getLogger(name) - logger.setLevel(log_level) + logger.setLevel(logging.DEBUG) + return logger + + +def get_parallel_logger(stream): + logger = logging.getLogger('parallel_logger_{!s}'.format(stream)) + logger.propagate = False + logger.setLevel(logging.DEBUG) + handler = logging.StreamHandler(stream) + handler.setFormatter(color_formatter) + handler.setLevel(log_level) + logger.addHandler(handler) return logger # Static variables to store color formatting strings.