From 2893c9acad24546f14367e93e35355f59bd6920f Mon Sep 17 00:00:00 2001 From: n3hrox Date: Sun, 3 Nov 2019 22:07:27 +0100 Subject: [PATCH] move footer to better place and change logging to stderr --- dvc/logger.py | 11 +++++++++++ dvc/main.py | 15 +++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dvc/logger.py b/dvc/logger.py index 075b1b680..f26ef31ce 100644 --- a/dvc/logger.py +++ b/dvc/logger.py @@ -11,6 +11,17 @@ import logging.config import colorama +FOOTER = ( + "\n{yellow}Having any troubles?{nc}" + " Hit us up at {blue}https://dvc.org/support{nc}," + " we are always happy to help!" +).format( + blue=colorama.Fore.BLUE, + nc=colorama.Fore.RESET, + yellow=colorama.Fore.YELLOW, +) + + class LoggingException(Exception): def __init__(self, record): msg = "failed to log {}".format(str(record)) diff --git a/dvc/main.py b/dvc/main.py index d21a51592..287443727 100644 --- a/dvc/main.py +++ b/dvc/main.py @@ -3,10 +3,11 @@ from __future__ import unicode_literals import logging -import colorama +import sys from dvc.cli import parse_args from dvc.lock import LockError +from dvc.logger import FOOTER from dvc.config import ConfigError from dvc.analytics import Analytics from dvc.exceptions import NotDvcRepoError, DvcParserError @@ -17,16 +18,6 @@ from dvc.utils.compat import is_py2 logger = logging.getLogger("dvc") -footer = ( - "\n{yellow}Having any troubles?{nc}" - " Hit us up at {blue}https://dvc.org/support{nc}," - " we are always happy to help!" -).format( - blue=colorama.Fore.BLUE, - nc=colorama.Fore.RESET, - yellow=colorama.Fore.YELLOW, -) - def main(argv=None): """Run dvc CLI command. @@ -87,7 +78,7 @@ def main(argv=None): clean_repos() if ret != 0: - logger.info(footer) + print(FOOTER, file=sys.stderr) Analytics().send_cmd(cmd, args, ret)