github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

Forgot to prune out the old jar code.

Browse source
This commit is contained in:
Aaron Mildenstein 2014-04-22 14:38:26 -05:00
parent c782d83074
commit a7f3003124
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/logstash/codecs/collectd.rb
View file

@ -93,22 +93,12 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
def register
@logger.info("Starting Collectd codec...")
if @typesdb.nil?
if __FILE__ =~ /^file:\/.+!.+/
begin
# Running from a jar, assume types.db is at the root.
jar_path = [__FILE__.split("!").first, "/types.db"].join("!")
@typesdb = [jar_path]
rescue => ex
raise "Failed to cache, due to: #{ex}\n#{ex.backtrace}"
end
if File.exists?("types.db")
@typesdb = ["types.db"]
elsif File.exists?("vendor/collectd/types.db")
@typesdb = ["vendor/collectd/types.db"]
else
if File.exists?("types.db")
@typesdb = ["types.db"]
elsif File.exists?("vendor/collectd/types.db")
@typesdb = ["vendor/collectd/types.db"]
else
raise LogStash::ConfigurationError, "You must specify 'typesdb => ...' in your collectd input"
end
raise LogStash::ConfigurationError, "You must specify 'typesdb => ...' in your collectd input"
end
end
@logger.info("Using internal types.db", :typesdb => @typesdb.to_s)