Allow log stripping to tolerate a missing stream identifier.#444
Merged
chetanmeh merged 4 commits intoapache:masterfrom Jul 22, 2019
Merged
Allow log stripping to tolerate a missing stream identifier.#444chetanmeh merged 4 commits intoapache:masterfrom
chetanmeh merged 4 commits intoapache:masterfrom
Conversation
Member
Author
|
This PR should fail because a unit test fails. A second commit will correct this but I want to address #443 first and will do so as part of this PR. |
rabbah
commented
Jun 26, 2019
commands/util.go
Outdated
| // the timestamp expected format is YYYY-MM-DDTHH:MM:SS.[0-9]+Z | ||
| // an optional " stdout" or " stderr" stream identifier | ||
| // and the rest as the log line | ||
| regex := regexp.MustCompile("\\d{4}-[01]{1}\\d{1}-[0-3]{1}\\d{1}T[0-2]{1}\\d{1}:[0-6]{1}\\d{1}:[0-6]{1}\\d{1}.\\d+Z( (stdout|stderr):)?\\s(.*)") |
Member
Author
There was a problem hiding this comment.
this regex does make a semantic change.
previously, the following line
anything stdout: this is stdout
would be stripped to
this is stdout
but with this patch the line will remain intact.
Member
Author
|
Added unit tests to travis in one of the commits. |
21 tasks
chetanmeh
approved these changes
Jul 22, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR allows log stripping to tolerate a missing log stream identifier. With the standalone controller, the
stdoutorstderrstream identifier is not readily available. This defeats the current regex matcher and logs are not stripped as a result. The patch corrects this.Also closes #443.