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

Fixing relative path issues left over from flatjar era

Browse source 
Use plugin_path and pattern_path

closes 1377
This commit is contained in:
Aaron Mildenstein 2014-05-14 19:33:21 -05:00
parent d6b94edc5d
commit ab9985c26a
6 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/logstash/codecs/netflow.rb
View file

@ -45,7 +45,7 @@ class LogStash::Codecs::Netflow < LogStash::Codecs::Base
@templates = Vash.new()
# Path to default Netflow v9 field definitions
filename = File.join(File.dirname(__FILE__), "netflow/netflow.yaml")
filename = LogStash::Environment.plugin_path("codecs/netflow/netflow.yaml")
begin
@fields = YAML.load_file(filename)

8
lib/logstash/environment.rb
View file

@ -31,5 +31,13 @@ module LogStash
def vendor_path(path)
return ::File.join(LOGSTASH_HOME, "vendor", path)
end
def plugin_path(path)
return ::File.join(LOGSTASH_HOME, "lib/logstash", path)
end
def pattern_path(path)
return ::File.join(LOGSTASH_HOME, "patterns", path)
end
end
end

2
lib/logstash/filters/grok.rb
View file

@ -216,7 +216,7 @@ class LogStash::Filters::Grok < LogStash::Filters::Base
# Detect if we are running from a jarfile, pick the right path.
@@patterns_path ||= Set.new
@@patterns_path += ["#{File.dirname(__FILE__)}/../../../patterns/*"]
@@patterns_path += [LogStash::Environment.pattern_path("*")]
public
def initialize(params)

2
lib/logstash/filters/multiline.rb
View file

@ -102,7 +102,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
# Detect if we are running from a jarfile, pick the right path.
@@patterns_path = Set.new
@@patterns_path += ["#{File.dirname(__FILE__)}/../../../patterns/*"]
@@patterns_path += [LogStash::Environment.pattern_path("*")]
public
def initialize(config = {})

12
lib/logstash/outputs/elasticsearch.rb
View file

@ -269,15 +269,9 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
public
def get_template
if @template.nil?
if File.exists?("elasticsearch-template.json")
@template = "elasticsearch-template.json"
else
path = File.join(File.dirname(__FILE__), "elasticsearch/elasticsearch-template.json")
if File.exists?(path)
@template = path
else
raise "You must specify 'template => ...' in your elasticsearch_http output"
end
@template = LogStash::Environment.plugin_path("outputs/elasticsearch/elasticsearch-template.json")
if !File.exists?(@template)
raise "You must specify 'template => ...' in your elasticsearch output (I looked for '#{@template}')"
end
end
template_json = IO.read(@template).gsub(/\n/,'')

11
lib/logstash/outputs/elasticsearch_http.rb
View file

@ -173,17 +173,14 @@ class LogStash::Outputs::ElasticSearchHTTP < LogStash::Outputs::Base
public
def get_template_json
if @template.nil?
if File.exists?("elasticsearch-template.json")
@template = "elasticsearch-template.json"
elsif File.exists?("lib/logstash/outputs/elasticsearch/elasticsearch-template.json")
@template = "lib/logstash/outputs/elasticsearch/elasticsearch-template.json"
else
raise "You must specify 'template => ...' in your elasticsearch_http output"
@template = LogStash::Environment.plugin_path("outputs/elasticsearch/elasticsearch-template.json")
if !File.exists?(@template)
raise "You must specify 'template => ...' in your elasticsearch_http output (I looked for '#{@template}')"
end
end
@template_json = IO.read(@template).gsub(/\n/,'')
@logger.info("Using mapping template", :template => @template_json)
end # def get_template
end # def get_template_json
public
def receive(event)