Disable log colors when not using a terminal (redux) (#355)

artie-labs · Apr 12, 2024 · e3293eb · e3293eb
1 parent 0d773ea
commit e3293eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/integration_tests/mysql/main.go b/integration_tests/mysql/main.go
@@ -10,7 +10,6 @@ import (
 	"os"
 
 	"github.com/lmittmann/tint"
-	"github.com/mattn/go-isatty"
 
 	"github.com/artie-labs/reader/config"
 	"github.com/artie-labs/reader/integration_tests/utils"
@@ -24,10 +23,7 @@ func main() {
 	if err := os.Setenv("TZ", "UTC"); err != nil {
 		logger.Fatal("Unable to set TZ env var: %w", err)
 	}
-	slog.SetDefault(slog.New(tint.NewHandler(os.Stderr, &tint.Options{
-		Level:   slog.LevelInfo,
-		NoColor: !isatty.IsTerminal(os.Stderr.Fd()),
-	})))
+	slog.SetDefault(slog.New(tint.NewHandler(os.Stderr, &tint.Options{})))
 
 	var mysqlHost string = os.Getenv("MYSQL_HOST")
 	if mysqlHost == "" {

diff --git a/integration_tests/postgres/main.go b/integration_tests/postgres/main.go
@@ -24,7 +24,7 @@ func main() {
 	if err := os.Setenv("TZ", "UTC"); err != nil {
 		logger.Fatal("Unable to set TZ env var: %w", err)
 	}
-	slog.SetDefault(slog.New(tint.NewHandler(os.Stderr, &tint.Options{Level: slog.LevelInfo})))
+	slog.SetDefault(slog.New(tint.NewHandler(os.Stderr, &tint.Options{})))
 
 	var pgHost string = os.Getenv("PG_HOST")
 	if pgHost == "" {

diff --git a/lib/logger/logger.go b/lib/logger/logger.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/getsentry/sentry-go"
 	"github.com/lmittmann/tint"
+	"github.com/mattn/go-isatty"
 	slogmulti "github.com/samber/slog-multi"
 	slogsentry "github.com/samber/slog-sentry/v2"
 
@@ -16,7 +17,10 @@ import (
 var handlersToTerminate []func()
 
 func NewLogger(settings *config.Settings) (*slog.Logger, func()) {
-	handler := tint.NewHandler(os.Stderr, &tint.Options{Level: slog.LevelInfo})
+	handler := tint.NewHandler(os.Stderr, &tint.Options{
+		Level:   slog.LevelInfo,
+		NoColor: !isatty.IsTerminal(os.Stderr.Fd()),
+	})
 
 	if settings != nil && settings.Reporting != nil && settings.Reporting.Sentry != nil && settings.Reporting.Sentry.DSN != "" {
 		if err := sentry.Init(sentry.ClientOptions{Dsn: settings.Reporting.Sentry.DSN}); err != nil {