dsl: Need '@' prefix for reserved system parameters. fix #2028 #2034
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: Masahiro Nakagawa <repeatedly@gmail.com>
okkez
reviewed
Jun 26, 2018
lib/fluent/config/dsl.rb
Outdated
| @@ -22,6 +22,8 @@ | |||
| module Fluent | |||
| module Config | |||
| module DSL | |||
| SYSTEM_PARAM = [:type, :id, :log_level] # Add '@' prefix to avoid deprecation message | |||
There was a problem hiding this comment.
How about RESERVED_PARAMETERS?
https://github.com/fluent/fluentd/blob/master/lib/fluent/config/element.rb#L46-L52
There was a problem hiding this comment.
Any chance to handle label, too?
diff --git a/lib/fluent/config/dsl.rb b/lib/fluent/config/dsl.rb
index c315a3f1..c8a0bb78 100644
--- a/lib/fluent/config/dsl.rb
+++ b/lib/fluent/config/dsl.rb
@@ -22,7 +22,7 @@ require 'fluent/config/element'
module Fluent
module Config
module DSL
- SYSTEM_PARAM = [:type, :id, :log_level] # Add '@' prefix to avoid depreca
tion message
+ SYSTEM_PARAM = [:type, :id, :log_level, :label] # Add '@' prefix to avoid
deprecation message
module Parser
def self.read(path)can handle label parameter with the following configuration:
source {
type :forward
label :"@forward"
}
label('@forward') {
filter('**') {
type :stdout
}
match('**') {
type :null
}
}Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
|
Applied reviews. |
|
Some tests are failed: https://travis-ci.org/fluent/fluentd/jobs/396700315#L554 We should resolve testcase failures before merging this PR. |
Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
cosmo0920
approved these changes
Jun 26, 2018
There was a problem hiding this comment.
LGTM except for still failing test.
https://travis-ci.org/fluent/fluentd/jobs/396706505#L554
Signed-off-by: Masahiro Nakagawa <repeatedly@gmail.com>
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.
Signed-off-by: Masahiro Nakagawa repeatedly@gmail.com