From 402668db71a93e1c5a187f217085cbebdf607f74 Mon Sep 17 00:00:00 2001 From: rot1024 Date: Thu, 22 Feb 2024 16:27:51 +0900 Subject: [PATCH] feat: enable to disable log color --- log/gcp.go | 1 + log/logger.go | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/log/gcp.go b/log/gcp.go index 720e5754..cef73fd7 100644 --- a/log/gcp.go +++ b/log/gcp.go @@ -11,6 +11,7 @@ var GCPEnv = []string{ "CLOUD_RUN_JOB", "K_SERVICE", "GOOGLE_CLOUD_PROJECT", + "GCP", } type severity string diff --git a/log/logger.go b/log/logger.go index 1d3c896a..b3d9adc5 100644 --- a/log/logger.go +++ b/log/logger.go @@ -65,7 +65,11 @@ func encoder() zapcore.Encoder { if isGCP() { return zapcore.NewJSONEncoder(gceEncoderConfig) } else { - return zapcore.NewConsoleEncoder(consoleEncoderConfig) + conf := consoleEncoderConfig + if isColorDisabled() { + conf.EncodeLevel = zapcore.CapitalLevelEncoder + } + return zapcore.NewConsoleEncoder(conf) } } @@ -270,3 +274,7 @@ func (l *Logger) msg(msg string) string { } return p + msg + s } + +func isColorDisabled() bool { + return os.Getenv("NO_COLOR") != "" +}