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

validate config file encoding when containing non-ascii characters

Browse source 
Fixes #1468
This commit is contained in:
wiibaa 2014-06-24 08:47:16 +02:00 • committed by Jordan Sissel
parent 98abbafb3d
commit ea7db02836
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/logstash/agent.rb
View file

@ -309,6 +309,7 @@ class LogStash::Agent < Clamp::Command
end end
config = "" config = ""
encoding_issue_files = []
Dir.glob(path).sort.each do |file| Dir.glob(path).sort.each do |file|
next unless File.file?(file) next unless File.file?(file)
if file.match(/~$/) if file.match(/~$/)
@ -316,7 +317,14 @@ class LogStash::Agent < Clamp::Command
next next
end end
@logger.debug("Reading config file", :file => file) @logger.debug("Reading config file", :file => file)
config << File.read(file) + "\n" cfg = File.read(file)
if !cfg.ascii_only? && !cfg.valid_encoding?
encoding_issue_files << file
end
config << cfg + "\n"
end
if (encoding_issue_files.any?)
fail("The following config files contains non-ascii characters but are not UTF-8 encoded #{encoding_issue_files}")
end end
return config return config
end # def load_config end # def load_config