engine: docker-compose manifest and global logs respect the same filters #919
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
nicks
reviewed
Jan 4, 2019
| @@ -148,3 +154,23 @@ func (w DockerComposeLogActionWriter) Write(p []byte) (n int, err error) { | |||
| } | |||
|
|
|||
| var _ store.Subscriber = &DockerComposeLogManager{} | |||
|
|
|||
| func shouldFilterDCLog(p []byte) bool { | |||
| if bytes.Contains(p, []byte("Attaching to")) { | |||
There was a problem hiding this comment.
this seems way too broad? and will catch lots of legit things.
There was a problem hiding this comment.
Yeah should be a "starts with" check?
|
@nicks sorry I should have made more clear: I saw this as a TODO in the code and decided to fix it as I re-familiarize myself with the log code. |
jazzdan
force-pushed
the
dmiller/ch1205/docker-compose-global-logs-dont-respect-filters
branch
5 times, most recently
from
b809b52 to
58339a6
Compare
jazzdan
force-pushed
the
dmiller/ch1205/docker-compose-global-logs-dont-respect-filters
branch
from
58339a6 to
1d98151
Compare
maiamcc
approved these changes
Jan 4, 2019
internal/build/test_utils.go
Outdated
| @@ -137,7 +137,11 @@ func (f *dockerBuildFixture) startRegistry() { | |||
| f.t.Fatal(err) | |||
| } | |||
|
|
|||
| err = stdout.WaitUntilContains("listening on", 5*time.Second) | |||
| if isCircleCI() { | |||
| err = stderr.WaitUntilContains("listening on", 5*time.Second) | |||
There was a problem hiding this comment.
womp womp. but legit.
I think i'd prefer combinedOut.WaitUntilContains and then we wouldn't need this conditional -- any way to do that?
maiamcc
reviewed
Jan 4, 2019
| cmd := exec.Command("docker", "run", "--name", "tilt-registry", "-p", "5005:5000", "registry:2") | ||
| cmd.Stdout = stdout | ||
| cmd.Stderr = stderr | ||
| cmd.Stderr = stdout |
There was a problem hiding this comment.
this should probs have a comment?
nicks
deleted the
dmiller/ch1205/docker-compose-global-logs-dont-respect-filters
branch
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.
No description provided.