feat: FTL_LOG_COLOR env to override tty detection #1508
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Open
alecthomas
reviewed
May 16, 2024
internal/log/plain.go
Outdated
| @@ -21,7 +21,9 @@ var _ Sink = (*plainSink)(nil) | |||
|
|
|||
| func newPlainSink(w io.Writer, logTime bool) *plainSink { | |||
| var isaTTY bool | |||
| if f, ok := w.(*os.File); ok { | |||
| if os.Getenv("FTL_LOG_COLOR") != "" { | |||
There was a problem hiding this comment.
Make this a Kong flag in log.Config, and pass it down into this function to avoid global state.
There was a problem hiding this comment.
I implemented this, but my main reason for this feature is in running tests and it now doesn't work with tests because ContextWithNewDefaultLogger doesn't go through log.Config. I did make a env check in there which is only checked when running tests.
|
Good idea BTW! |
alecthomas
force-pushed
the
main
branch
8 times, most recently
from
be01cce to
2fef0b4
Compare
gak
force-pushed
the
gak/override-tty-log-colors
branch
2 times, most recently
from
1f17bde to
238c08d
Compare
alecthomas
approved these changes
May 16, 2024
| @@ -66,5 +66,7 @@ func ContextWithLogger(ctx context.Context, logger *Logger) context.Context { | |||
| } | |||
|
|
|||
| func ContextWithNewDefaultLogger(ctx context.Context) context.Context { | |||
| return ContextWithLogger(ctx, Configure(os.Stderr, Config{Level: Debug})) | |||
| // Matches LOG_COLOR in log.Config. This is a special case for the default logger in testing. | |||
| color := os.Getenv("LOG_COLOR") != "" | |||
LOG_COLOR=1 LOG_LEVEL=trace go test -v ./buildengine -run TestEngine
gak
force-pushed
the
gak/override-tty-log-colors
branch
from
238c08d to
f98e769
Compare
alecthomas
approved these changes
May 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LOG_COLOR env to override tty detection
eg
LOG_COLOR=1 LOG_LEVEL=trace go test -v ./buildengine -run TestEngine