fix two bugs #9
Merged
fix two bugs #9
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
fix two bugs; 1: while the log variable in square brackets,like [$remote_addr] parser will throw Invalid regular expression; 2: when then variable is null ,this whole piece of log will parse to null
| @@ -19,7 +20,7 @@ var Parser = module.exports = function (format) { | |||
| this.directives[match[1]] = i++; | |||
| if (match[2]) { | |||
| boundary = this.escape(match[2]); | |||
| regex = '([^' + boundary + ']+)' + boundary; | |||
| regex = '([^' + boundary + ']+)?' + boundary; | |||
There was a problem hiding this comment.
regex = '([^' + boundary + ']*?)' + boundary; would be better here
There was a problem hiding this comment.
That ? in *? look like not necessary, I change regex = '([^' + boundary + ']+)?' to regex = '([^' + boundary + ']*)'
There was a problem hiding this comment.
The *? is not necessary, but it's slightly more efficient than a plain * because it instructs the regex engine to match characters lazily.
for better perfermance
|
Can you provide an example as to when the variable will be null? It was my understanding that nginx outputs |
|
log_format main '[$seashell]'; |
added 2 commits
August 12, 2015 10:15
replace [] into [-] while parse line
should fix parser for all case
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.
fix two bugs;
1: while the log variable in square brackets,like
[$remote_addr] parser will throw Invalid regular expression;
2: when then variable is null ,this whole piece of log will parse to
null