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

Patches per @colinsurprenant

Browse source
This commit is contained in:
Aaron Mildenstein 2014-04-23 15:46:17 -05:00
parent f16582b1ba
commit 56b7f1b274
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,13 +82,6 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
# "Sign" or "Encrypt"
config :authfile, :validate => :string
public
def initialize(params)
@types = {} # This needs to be called before register (which super does).
super
#@timestamp = Time.now().utc
end # def initialize
public
def register
@logger.info("Starting Collectd codec...")
@ -102,7 +95,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
end
end
@logger.info("Using internal types.db", :typesdb => @typesdb.to_s)
get_types(@typesdb)
@types = get_types(@typesdb)
if ([SECURITY_SIGN, SECURITY_ENCR].include?(@security_level))
if @authfile.nil?
@ -121,6 +114,7 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
public
def get_types(paths)
types = {}
# Get the typesdb
paths.each do |path|
@logger.info("Getting Collectd typesdb info", :typesdb => path.to_s)
@ -128,11 +122,12 @@ class LogStash::Codecs::Collectd < LogStash::Codecs::Base
typename, *line = line.strip.split
next if typename.nil? || if typename[0,1] != '#' # Don't process commented or blank lines
v = line.collect { |l| l.strip.split(":")[0] }
@types[typename] = v
types[typename] = v
end
end
end
@logger.debug("Collectd Types", :types => @types.to_s)
@logger.debug("Collectd Types", :types => types.to_s)
return types
end # def get_types
public