github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

use closure table instead of ivars

Browse source
This commit is contained in:
Colin Surprenant 2016-05-13 18:16:39 -04:00 • committed by Joao Duarte
parent 723046fb1e
commit 98abb22258
2 changed files with 31 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
logstash-core/lib/logstash/config/config_ast.rb
View file

@ -94,6 +94,7 @@ module LogStash; module Config; module AST
@outputs = []
@periodic_flushers = []
@shutdown_flushers = []
@generated_objects = {}
CODE
sections = recursive_select(LogStash::Config::AST::PluginSection)
@ -150,31 +151,31 @@ module LogStash; module Config; module AST
code << <<-CODE
#{name} = #{plugin.compile_initializer}
@#{plugin.plugin_type}s << #{name}
@generated_objects[:#{name}] = #{plugin.compile_initializer}
@#{plugin.plugin_type}s << @generated_objects[:#{name}]
CODE
# The flush method for this filter.
if plugin.plugin_type == "filter"
code << <<-CODE
#{name}_flush = lambda do |options, &block|
@logger.debug? && @logger.debug(\"Flushing\", :plugin => #{name})
@generated_objects[:#{name}_flush] = lambda do |options, &block|
@logger.debug? && @logger.debug(\"Flushing\", :plugin => @generated_objects[:#{name}])
events = #{name}.flush(options)
events = @generated_objects[:#{name}].flush(options)
return if events.nil? || events.empty?
@logger.debug? && @logger.debug(\"Flushing\", :plugin => #{name}, :events => events)
@logger.debug? && @logger.debug(\"Flushing\", :plugin => @generated_objects[:#{name}], :events => events)
#{plugin.compile_starting_here.gsub(/^/, " ")}
events.each{|e| block.call(e)}
end
if #{name}.respond_to?(:flush)
@periodic_flushers << #{name}_flush if #{name}.periodic_flush
@shutdown_flushers << #{name}_flush
if @generated_objects[:#{name}].respond_to?(:flush)
@periodic_flushers << @generated_objects[:#{name}_flush] if @generated_objects[:#{name}].periodic_flush
@shutdown_flushers << @generated_objects[:#{name}_flush]
end
CODE
@ -197,7 +198,8 @@ module LogStash; module Config; module AST
# Unique number for every plugin.
@i += 1
# store things as ivars, like @filter_grok_3
var = "@#{plugin.plugin_type}_#{plugin.plugin_name}_#{@i}"
var = :"#{plugin.plugin_type}_#{plugin.plugin_name}_#{@i}"
# puts("var=#{var.inspect}")
@variables[plugin] = var
end
return @variables
@ -239,13 +241,13 @@ module LogStash; module Config; module AST
def compile
case plugin_type
when "input"
return "start_input(#{variable_name})"
return "start_input(@generated_objects[:#{variable_name}])"
when "filter"
return <<-CODE
events = #{variable_name}.multi_filter(events)
events = @generated_objects[:#{variable_name}].multi_filter(events)
CODE
when "output"
return "targeted_outputs << #{variable_name}\n"
return "targeted_outputs << @generated_objects[:#{variable_name}]\n"
when "codec"
settings = attributes.recursive_select(Attribute).collect(&:compile).reject(&:empty?)
attributes_code = "LogStash::Util.hash_merge_many(#{settings.map { |c| "{ #{c} }" }.join(", ")})"

16
logstash-core/spec/logstash/pipeline_spec.rb
View file

@ -616,4 +616,20 @@ describe LogStash::Pipeline do
end
end
end
context "Pipeline object" do
before do
allow(LogStash::Plugin).to receive(:lookup).with("input", "generator").and_return(LogStash::Inputs::Generator)
allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummyfilter").and_return(DummyFilter)
allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(DummyOutput)
end
let(:pipeline1) { LogStash::Pipeline.new("input { generator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
let(:pipeline2) { LogStash::Pipeline.new("input { generator {} } filter { dummyfilter {} } output { dummyoutput {}}") }
it "should not add ivars" do
expect(pipeline1.instance_variables).to eq(pipeline2.instance_variables)
end
end
end