Makes NewNginxParser tolerant of log_format directives with newlines#44
Open
dcarney wants to merge 2 commits intosatyrius:masterfrom
Open
Makes NewNginxParser tolerant of log_format directives with newlines#44dcarney wants to merge 2 commits intosatyrius:masterfrom
dcarney wants to merge 2 commits intosatyrius:masterfrom
Conversation
Owner
|
Thanks the the fix. Could you please make Travis green before we merge it? |
|
to swoop in here, I just looked - I think the Travis troubles are larger/independent of this PR and due to Go 1.13 modules (only |
Author
|
@satyrius What do you think about the comment above from @bobby-stripe ? It does appear that the CI failure is independent of my particular PR changes. Also, it would likely be helpful to change the CI build to test new Go versions > 1.5. I think that should be it's own PR however, instead of being co-mingled into this PR. Let me know what you think, so that we can keep progress moving towards getting this PR merged. Thanks! |
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
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 makes slight modifications to the regex used in the
NewNginxParserfunc, so that it correctly parsesnginxlog_formatdirectives that contain newlines after the name.This is best illustrated with an example.
This is perfectly valid
nginxconfig (elided for brevity):Previously, the NewNginxParser regex would not properly match the
log_format mainline in such a case, since it expected to match one or more characters in a capture group before the end of the line. This would work if we "hacked" the line to include trailing whitespace, but that solution is error-prone and literally invisible to the naked eye. 😄This PR changes that, and makes one more trivial change to that particular regex: it uses the standard
%sformatting verb when building the regex, rather than the%v.The rest of the PR consists of comments and additional test cases.
Let me know if you have any concerns, or if you'd like further modifications to be made. Thanks for looking!