expose a function, for logc, instead of the array directly which didn…

…'t change when Color mode changed
fortio · Aug 1, 2023 · 8d08e3f · 8d08e3f
1 parent a05b03a
commit 8d08e3f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/console_logging.go b/console_logging.go
@@ -63,7 +63,7 @@ var (
 	Colors = ANSIColors
 
 	// Mapping of log levels to color.
-	LevelToColor = []string{
+	levelToColor = []string{
 		Colors.Gray,
 		Colors.Cyan,
 		Colors.Green,
@@ -76,6 +76,14 @@ var (
 	Color = false
 )
 
+// LevelToColor returns the color to use for the given level (or empty string when color mode is disabled).
+func LevelToColor(level Level) string {
+	if !Color {
+		return ""
+	}
+	return levelToColor[level]
+}
+
 // ConsoleLogging is a utility to check if the current logger output is a console (terminal).
 func ConsoleLogging() bool {
 	f, ok := jsonWriter.(*os.File)

diff --git a/logger.go b/logger.go
@@ -358,7 +358,7 @@ func logUnconditionalf(logFileAndLine bool, lvl Level, format string, rest ...in
 		file = file[strings.LastIndex(file, "/")+1:]
 		if Color {
 			jsonWrite(fmt.Sprintf("%s%s%s%s %s:%d%s%s%s\n",
-				colorTimestamp(), colorGID(), LevelToColor[lvl], LevelToStrA[lvl][0:1],
+				colorTimestamp(), colorGID(), levelToColor[lvl], LevelToStrA[lvl][0:1],
 				file, line, Config.LogPrefix, fmt.Sprintf(format, rest...), Colors.Reset))
 		} else if Config.JSON {
 			jsonWrite(fmt.Sprintf("{%s\"level\":%s,%s\"file\":%q,\"line\":%d,\"msg\":%q}\n",
@@ -369,7 +369,7 @@ func logUnconditionalf(logFileAndLine bool, lvl Level, format string, rest ...in
 	} else {
 		if Color {
 			jsonWrite(fmt.Sprintf("%s%s%s%s %s%s%s\n",
-				colorTimestamp(), colorGID(), LevelToColor[lvl], LevelToStrA[lvl][0:1], Config.LogPrefix,
+				colorTimestamp(), colorGID(), levelToColor[lvl], LevelToStrA[lvl][0:1], Config.LogPrefix,
 				fmt.Sprintf(format, rest...), Colors.Reset))
 		} else if Config.JSON {
 			jsonWrite(fmt.Sprintf("{%s\"level\":%s,%s\"msg\":%q}\n",
@@ -529,7 +529,7 @@ func S(lvl Level, msg string, attrs ...KeyVal) {
 	buf := strings.Builder{}
 	var format string
 	if Color {
-		format = Colors.Reset + ", " + Colors.Blue + "%s" + Colors.Reset + "=" + LevelToColor[lvl] + "%q"
+		format = Colors.Reset + ", " + Colors.Blue + "%s" + Colors.Reset + "=" + levelToColor[lvl] + "%q"
 	} else if Config.JSON {
 		format = ",%q:%q"
 	} else {
@@ -544,7 +544,7 @@ func S(lvl Level, msg string, attrs ...KeyVal) {
 		file = file[strings.LastIndex(file, "/")+1:]
 		if Color {
 			jsonWrite(fmt.Sprintf("%s%s%s%s %s:%d%s%s%s%s\n",
-				colorTimestamp(), colorGID(), LevelToColor[lvl], LevelToStrA[lvl][0:1],
+				colorTimestamp(), colorGID(), levelToColor[lvl], LevelToStrA[lvl][0:1],
 				file, line, Config.LogPrefix, msg, buf.String(), Colors.Reset))
 		} else if Config.JSON {
 			jsonWrite(fmt.Sprintf("{%s\"level\":%s,%s\"file\":%q,\"line\":%d,\"msg\":%q%s}\n",
@@ -555,7 +555,7 @@ func S(lvl Level, msg string, attrs ...KeyVal) {
 	} else {
 		if Color {
 			jsonWrite(fmt.Sprintf("%s%s%s%s %s%s%s%s\n",
-				colorTimestamp(), colorGID(), LevelToColor[lvl], LevelToStrA[lvl][0:1], Config.LogPrefix, msg, buf.String(), Colors.Reset))
+				colorTimestamp(), colorGID(), levelToColor[lvl], LevelToStrA[lvl][0:1], Config.LogPrefix, msg, buf.String(), Colors.Reset))
 		} else if Config.JSON {
 			jsonWrite(fmt.Sprintf("{%s\"level\":%s,\"msg\":%q%s}\n",
 				jsonTimestamp(), LevelToJSON[lvl], msg, buf.String()))