From 7b56fdb96474c5c2a53033a5ef40077a68c70d82 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Mon, 30 May 2016 17:18:38 +0200
Subject: [PATCH] Restore levelText setting in '--no-color' mode
---
helpers/formatter/runner_text_formatter.go | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/helpers/formatter/runner_text_formatter.go b/helpers/formatter/runner_text_formatter.go
index 08817aece..32ff10e93 100644
--- a/helpers/formatter/runner_text_formatter.go
+++ b/helpers/formatter/runner_text_formatter.go
@@ -51,27 +51,27 @@ func (f *RunnerTextFormatter) printColored(b *bytes.Buffer, entry *logrus.Entry,
}
func (f *RunnerTextFormatter) getLevelColorAndText(level logrus.Level) (lvlColor, lvlText, resetColor string) {
- color := map[logrus.Level]string{
- logrus.DebugLevel: helpers.ANSI_BOLD_WHITE,
- logrus.WarnLevel: helpers.ANSI_YELLOW,
- logrus.ErrorLevel: helpers.ANSI_BOLD_RED,
- logrus.FatalLevel: helpers.ANSI_BOLD_RED,
- logrus.PanicLevel: helpers.ANSI_BOLD_RED,
- }
-
text := map[logrus.Level]string{
- logrus.DebugLevel: "",
logrus.WarnLevel: "WARNING: ",
logrus.ErrorLevel: "ERROR: ",
logrus.FatalLevel: "FATAL: ",
logrus.PanicLevel: "PANIC: ",
}
+ lvlText = text[level]
+
if f.DisableColors == true && f.ForceColors != true {
return
}
- lvlText = text[level]
+ color := map[logrus.Level]string{
+ logrus.DebugLevel: helpers.ANSI_BOLD_WHITE,
+ logrus.WarnLevel: helpers.ANSI_YELLOW,
+ logrus.ErrorLevel: helpers.ANSI_BOLD_RED,
+ logrus.FatalLevel: helpers.ANSI_BOLD_RED,
+ logrus.PanicLevel: helpers.ANSI_BOLD_RED,
+ }
+
lvlColor = color[level]
resetColor = helpers.ANSI_RESET
return
--
GitLab