From 999b63b4ea5b8c026e364bc82516450db2694f18 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Sun, 28 Jul 2019 16:59:47 +0800 Subject: [PATCH] remove setup_logger in main_hrun() --- httprunner/cli.py | 13 +++++++------ httprunner/logger.py | 5 +---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/httprunner/cli.py b/httprunner/cli.py index 03e0c336..f6000427 100644 --- a/httprunner/cli.py +++ b/httprunner/cli.py @@ -5,7 +5,7 @@ def main_hrun(): """ import sys import argparse - from httprunner import logger + from httprunner.logger import color_print from httprunner import __description__, __version__ from httprunner.api import HttpRunner from httprunner.compat import is_py2 @@ -52,13 +52,12 @@ def main_hrun(): help="Prettify JSON testcase format.") args = parser.parse_args() - logger.setup_logger(args.log_level, args.log_file) if is_py2: - logger.log_warning(get_python2_retire_msg()) + color_print(get_python2_retire_msg(), "YELLOW") if args.version: - logger.color_print("{}".format(__version__), "GREEN") + color_print("{}".format(__version__), "GREEN") exit(0) if args.validate: @@ -77,13 +76,15 @@ def main_hrun(): failfast=args.failfast, save_tests=args.save_tests, report_template=args.report_template, - report_dir=args.report_dir + report_dir=args.report_dir, + log_level=args.log_level, + log_file=args.log_file ) try: for path in args.testcase_paths: runner.run(path, dot_env_path=args.dot_env_path) except Exception: - logger.log_error("!!!!!!!!!! exception stage: {} !!!!!!!!!!".format(runner.exception_stage)) + color_print("!!!!!!!!!! exception stage: {} !!!!!!!!!!".format(runner.exception_stage), "YELLOW") raise if runner.summary and runner.summary["success"]: diff --git a/httprunner/logger.py b/httprunner/logger.py index d6612da2..62cb56c6 100644 --- a/httprunner/logger.py +++ b/httprunner/logger.py @@ -19,10 +19,7 @@ logger = logging.getLogger("httprunner") def setup_logger(log_level, log_file=None): - """setup root logger with ColoredFormatter.""" - if len(logger.handlers) > 0: - return - + """setup logger with ColoredFormatter.""" level = getattr(logging, log_level.upper(), None) if not level: color_print("Invalid log level: %s" % log_level, "RED")