diff --git a/ansiblelater/__init__.py b/ansiblelater/__init__.py index 1f64015..ec67d14 100644 --- a/ansiblelater/__init__.py +++ b/ansiblelater/__init__.py @@ -6,7 +6,7 @@ __license__ = "MIT" __maintainer__ = "Robert Kaussow" __email__ = "mail@geeklabor.de" __url__ = "https://github.com/xoxys/ansible-later" -__version__ = "0.3.1" +__version__ = "0.3.2" from ansiblelater import logger diff --git a/ansiblelater/logger.py b/ansiblelater/logger.py index 949ed93..2271c5a 100644 --- a/ansiblelater/logger.py +++ b/ansiblelater/logger.py @@ -9,7 +9,7 @@ import colorama from pythonjsonlogger import jsonlogger from six import iteritems -CONSOLE_FORMAT = "%(levelname)s: {}%(message)s" +CONSOLE_FORMAT = "{}%(levelname)s:{} %(message)s" JSON_FORMAT = "(asctime) (levelname) (message)" @@ -185,5 +185,5 @@ def color_text(color, msg): :returns: string """ - msg = msg.format(colorama.Style.DIM) + msg = msg.format(colorama.Style.BRIGHT, colorama.Style.NORMAL) return "{}{}{}".format(color, msg, colorama.Style.RESET_ALL) diff --git a/ansiblelater/test/unit/test_logger.py b/ansiblelater/test/unit/test_logger.py index 3d23a1c..c1b30e8 100644 --- a/ansiblelater/test/unit/test_logger.py +++ b/ansiblelater/test/unit/test_logger.py @@ -22,8 +22,9 @@ def test_critical(capsys, mocker): _, stderr = capsys.readouterr() print( - "{}CRITICAL: {}foo\n{}".format( - colorama.Fore.RED, colorama.Style.DIM, colorama.Style.RESET_ALL + "{}{}CRITICAL:{} foo\n{}".format( + colorama.Fore.RED, colorama.Style.BRIGHT, colorama.Style.NORMAL, + colorama.Style.RESET_ALL ) ) x, _ = capsys.readouterr() @@ -37,8 +38,9 @@ def test_error(capsys, mocker): _, stderr = capsys.readouterr() print( - "{}ERROR: {}foo\n{}".format( - colorama.Fore.RED, colorama.Style.DIM, colorama.Style.RESET_ALL + "{}{}ERROR:{} foo\n{}".format( + colorama.Fore.RED, colorama.Style.BRIGHT, colorama.Style.NORMAL, + colorama.Style.RESET_ALL ) ) x, _ = capsys.readouterr() @@ -52,8 +54,9 @@ def test_warn(capsys, mocker): stdout, _ = capsys.readouterr() print( - "{}WARNING: {}foo\n{}".format( - colorama.Fore.YELLOW, colorama.Style.DIM, colorama.Style.RESET_ALL + "{}{}WARNING:{} foo\n{}".format( + colorama.Fore.YELLOW, colorama.Style.BRIGHT, colorama.Style.NORMAL, + colorama.Style.RESET_ALL ) ) x, _ = capsys.readouterr() @@ -67,8 +70,9 @@ def test_info(capsys, mocker): stdout, _ = capsys.readouterr() print( - "{}INFO: {}foo\n{}".format( - colorama.Fore.BLUE, colorama.Style.DIM, colorama.Style.RESET_ALL + "{}{}INFO:{} foo\n{}".format( + colorama.Fore.BLUE, colorama.Style.BRIGHT, colorama.Style.NORMAL, + colorama.Style.RESET_ALL ) ) x, _ = capsys.readouterr()