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

- ruby's String#split has some really shitty defaults.

Browse source 
"foo\n".split("\n") == [ "foo" ]

  when it should really be [ "foo", "" ]
  which can be achieved with String#split("\n", -1)

(╯°□°）╯︵ ┻━┻
This commit is contained in:
Jordan Sissel 2013-06-15 22:46:56 -07:00
parent b2e243f95f
commit a6542d73e0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/logstash/config/config_ast.rb
View file

@ -64,7 +64,7 @@ module LogStash; module Config; module AST
definitions << " @logger.info(\"#{type} received\", :event => event)"
sections.select { |s| s.plugin_type.text_value == type }.each do |s|
definitions << s.compile.split("\n").map { |e| " #{e}" }.join("\n")
definitions << s.compile.split("\n", -1).map { |e| " #{e}" }.join("\n")
end
if type == "filter"
@ -73,7 +73,7 @@ module LogStash; module Config; module AST
definitions << "end"
end
code += definitions.join("\n").split("\n").collect { |l| " #{l}" }
code += definitions.join("\n").split("\n", -1).collect { |l| " #{l}" }
code << "end"
return code.join("\n")
end
@ -232,21 +232,21 @@ module LogStash; module Config; module AST
def compile
children = recursive_inject { |e| e.is_a?(Branch) || e.is_a?(Plugin) }
return "if #{condition.compile}\n" \
<< children.collect(&:compile).map { |s| s.split("\n").map { |l| " " + l }.join("\n") }.join("") << "\n"
<< children.collect(&:compile).map { |s| s.split("\n", -1).map { |l| " " + l }.join("\n") }.join("") << "\n"
end
end
class Elsif < Node
def compile
children = recursive_inject { |e| e.is_a?(Branch) || e.is_a?(Plugin) }
return "elsif #{condition.compile}\n" \
<< children.collect(&:compile).map { |s| s.split("\n").map { |l| " " + l }.join("\n") }.join("") << "\n"
<< children.collect(&:compile).map { |s| s.split("\n", -1).map { |l| " " + l }.join("\n") }.join("") << "\n"
end
end
class Else < Node
def compile
children = recursive_inject { |e| e.is_a?(Branch) || e.is_a?(Plugin) }
return "else\n" \
<< children.collect(&:compile).map { |s| s.split("\n").map { |l| " " + l }.join("\n") }.join("") << "\n"
<< children.collect(&:compile).map { |s| s.split("\n", -1).map { |l| " " + l }.join("\n") }.join("") << "\n"
end
end