-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add plugin helpers for parser and formatter #1023
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
# | ||
# Fluentd | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
require 'fluent/plugin' | ||
require 'fluent/plugin/formatter' | ||
require 'fluent/config/element' | ||
|
||
module Fluent | ||
module PluginHelper | ||
module Formatter | ||
def formatter_create(usage: '', type: nil, conf: nil) | ||
formatter = @_formatters[usage] | ||
return formatter if formatter | ||
|
||
if !type | ||
raise ArgumentError, "BUG: both type and conf are not specified" unless conf | ||
raise Fluent::ConfigError, "@type is required in <format>" unless conf['@type'] | ||
type = conf['@type'] | ||
end | ||
formatter = Fluent::Plugin.new_formatter(type, parent: self) | ||
config = case conf | ||
when Fluent::Config::Element | ||
conf | ||
when Hash | ||
# in code, programmer may use symbols as keys, but Element needs strings | ||
conf = Hash[conf.map{|k,v| [k.to_s, v]}] | ||
Fluent::Config::Element.new('format', usage, conf, []) | ||
when nil | ||
Fluent::Config::Element.new('format', usage, {}, []) | ||
else | ||
raise ArgumentError, "BUG: conf must be a Element, Hash (or unspecified), but '#{conf.class}'" | ||
end | ||
formatter.configure(config) | ||
if @_formatters_started | ||
formatter.start | ||
end | ||
|
||
@_formatters[usage] = formatter | ||
formatter | ||
end | ||
|
||
def self.included(mod) | ||
mod.instance_eval do | ||
# minimum section definition to instantiate formatter plugin instances | ||
config_section :format, required: false, multi: true, param_name: :formatter_configs do | ||
config_argument :usage, :string, default: '' | ||
config_param :@type, :string | ||
end | ||
end | ||
end | ||
|
||
attr_reader :_formatters # for tests | ||
|
||
def initialize | ||
super | ||
@_formatters_started = false | ||
@_formatters = {} # usage => formatter | ||
end | ||
|
||
def configure(conf) | ||
super | ||
|
||
@formatter_configs.each do |section| | ||
if @_formatters[section.usage] | ||
raise Fluent::ConfigError, "duplicated formatter configured: #{section.usage}" | ||
end | ||
formatter = Plugin.new_formatter(section[:@type], parent: self) | ||
formatter.configure(section.corresponding_config_element) | ||
@_formatters[section.usage] = formatter | ||
end | ||
end | ||
|
||
def start | ||
super | ||
@_formatters_started = true | ||
@_formatters.each_pair do |usage, formatter| | ||
formatter.start | ||
end | ||
end | ||
|
||
def formatter_operate(method_name, &block) | ||
@_formatters.each_pair do |usage, formatter| | ||
begin | ||
formatter.send(method_name) | ||
block.call(formatter) if block_given? | ||
rescue => e | ||
log.error "unexpected error while #{method_name}", usage: usage, formatter: formatter, error: e | ||
end | ||
end | ||
end | ||
|
||
def stop | ||
super | ||
formatter_operate(:stop) | ||
end | ||
|
||
def before_shutdown | ||
formatter_operate(:before_shutdown) | ||
super | ||
end | ||
|
||
def shutdown | ||
formatter_operate(:shutdown) | ||
super | ||
end | ||
|
||
def after_shutdown | ||
formatter_operate(:after_shutdown) | ||
super | ||
end | ||
|
||
def close | ||
formatter_operate(:close) | ||
super | ||
end | ||
|
||
def terminate | ||
formatter_operate(:terminate) | ||
@_formatters_started = false | ||
@_formatters = {} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right. |
||
super | ||
end | ||
end | ||
end | ||
end |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,138 @@ | ||
# | ||
# Fluentd | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
require 'fluent/plugin' | ||
require 'fluent/plugin/parser' | ||
require 'fluent/config/element' | ||
|
||
module Fluent | ||
module PluginHelper | ||
module Parser | ||
def parser_create(usage: '', type: nil, conf: nil) | ||
parser = @_parsers[usage] | ||
return parser if parser | ||
|
||
if !type | ||
raise ArgumentError, "BUG: both type and conf are not specified" unless conf | ||
raise Fluent::ConfigError, "@type is required in <parse>" unless conf['@type'] | ||
type = conf['@type'] | ||
end | ||
parser = Fluent::Plugin.new_parser(type, parent: self) | ||
config = case conf | ||
when Fluent::Config::Element | ||
conf | ||
when Hash | ||
# in code, programmer may use symbols as keys, but Element needs strings | ||
conf = Hash[conf.map{|k,v| [k.to_s, v]}] | ||
Fluent::Config::Element.new('parse', usage, conf, []) | ||
when nil | ||
Fluent::Config::Element.new('parse', usage, {}, []) | ||
else | ||
raise ArgumentError, "BUG: conf must be a Element, Hash (or unspecified), but '#{conf.class}'" | ||
end | ||
parser.configure(config) | ||
if @_parsers_started | ||
parser.start | ||
end | ||
|
||
@_parsers[usage] = parser | ||
parser | ||
end | ||
|
||
def self.included(mod) | ||
mod.instance_eval do | ||
# minimum section definition to instantiate parser plugin instances | ||
config_section :parse, required: false, multi: true, param_name: :parser_configs do | ||
config_argument :usage, :string, default: '' | ||
config_param :@type, :string | ||
end | ||
end | ||
end | ||
|
||
attr_reader :_parsers # for tests | ||
|
||
def initialize | ||
super | ||
@_parsers_started = false | ||
@_parsers = {} # usage => parser | ||
end | ||
|
||
def configure(conf) | ||
super | ||
|
||
@parser_configs.each do |section| | ||
if @_parsers[section.usage] | ||
raise Fluent::ConfigError, "duplicated parsers configured: #{section.usage}" | ||
end | ||
parser = Plugin.new_parser(section[:@type], parent: self) | ||
parser.configure(section.corresponding_config_element) | ||
@_parsers[section.usage] = parser | ||
end | ||
end | ||
|
||
def start | ||
super | ||
@_parsers_started = true | ||
@_parsers.each_pair do |usage, parser| | ||
parser.start | ||
end | ||
end | ||
|
||
def parser_operate(method_name, &block) | ||
@_parsers.each_pair do |usage, parser| | ||
begin | ||
parser.send(method_name) | ||
block.call(parser) if block_given? | ||
rescue => e | ||
log.error "unexpected error while #{method_name}", usage: usage, parser: parser, error: e | ||
end | ||
end | ||
end | ||
|
||
def stop | ||
super | ||
parser_operate(:stop) | ||
end | ||
|
||
def before_shutdown | ||
parser_operate(:before_shutdown) | ||
super | ||
end | ||
|
||
def shutdown | ||
parser_operate(:shutdown) | ||
super | ||
end | ||
|
||
def after_shutdown | ||
parser_operate(:after_shutdown) | ||
super | ||
end | ||
|
||
def close | ||
parser_operate(:close) | ||
super | ||
end | ||
|
||
def terminate | ||
parser_operate(:terminate) | ||
@_parsers_started = false | ||
@_parsers = {} | ||
super | ||
end | ||
end | ||
end | ||
end |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line should be moved to end of this fucntion?
Formatters don't start yet in this position.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. It's needed to set the variable to true here.
If any formatter calls
formatter_create
, that instance will not be started if we set it true at the end of this method.