This repository has been archived by the owner on Sep 9, 2020. It is now read-only.
make combinedOutput actually output both stdout and stderr #881
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
|
ahh, that's the license header checker. (need a rebase, too) |
erizocosmico
force-pushed
the
fix/cmd-combined-output
branch
2 times, most recently
from
7b470dc
to
61047b0
Compare
|
Oopsie, fixed! |
sdboyer
suggested changes
Jul 26, 2017
internal/gps/cmd.go
Outdated
| @@ -22,6 +23,7 @@ import ( | |||
| type monitoredCmd struct { | |||
| cmd *exec.Cmd | |||
| timeout time.Duration | |||
| output *syncBuffer | |||
There was a problem hiding this comment.
yeah, this seems like it might be overkill, per your note in the OP.
what if instead, if the user calls monitoredCmd.combinedOutput(), then we just reuse one of the activityBuffers - e.g., assign cmd.stdout to cmd.stderr? i can't think of any immediate problems with that...
erizocosmico
force-pushed
the
fix/cmd-combined-output
branch
2 times, most recently
from
4323cd0
to
94ceb20
Compare
Signed-off-by: Miguel Molina <miguel@erizocosmi.co>
|
Done @sdboyer! |
sdboyer
approved these changes
Jul 26, 2017
|
cool! hmm, that failure's on a test that i believe we're refactoring, anyway. easiest thing is probably to hang tight for a few days while we get that sorted. |
|
eh, i'm not going to leave this hanging - the failure is unrelated. in we go. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What does this do / why do we need it?
When the command exits with status 0,
combinedOutputshould return the output of both stderr and stdout combined. Previously, it only returned stdout contents.What should your reviewer look out for in this PR?
Maybe the
syncBufferis a bit of an overkill? After all, stdlib'sCombinedOutputuses abytes.Bufferfor both without any mutex.Do you need help or clarification on anything?
Which issue(s) does this PR fix?
I think none, just saw the TODO and started fixing this