geoip2: extend with template option #3051
Merged
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
Signed-off-by: Kokan <[email protected]>
Right now only `template()` is included with the parser_opt rule, but this also allows any other future enhancements. Signed-off-by: Kokan <[email protected]>
Signed-off-by: Kokan <[email protected]>
Signed-off-by: Kokan <[email protected]>
Signed-off-by: Kokan <[email protected]>
After this patch providing a format string after opening bracket became optional, and the following are equal:
```
geoip2("format-string");
geoip2(format-string);
geoip2(template("format-string"));
```
Signed-off-by: Kokan <[email protected]>
|
Build SUCCESS |
furiel
approved these changes
Dec 30, 2019
@furiel do you think marking |
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.
Opposed to parsers that by default uses
MESSAGEand that could be further specialised withtemplate()options, thegeoip2always usestemplate. That is enforced with the grammar rule always requiring a template in a form of string:geoip2("template-format").The PR includes the following changes:
geoip2grammer with generalparse_optrules (currently only includestemplate()templatetemplate()opposed to usingMESSAGEfield, that works for any parser, but never actually used in case ofgeoip2As a results both are possible configuration option: