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

Merge pull request #705 from logstash/fix-numeric-handling-in-config

Browse source 
When doing number validation, leave a  Numeric as-is and only try to do
This commit is contained in:
Jordan Sissel 2013-10-08 06:55:21 -07:00
commit 671198668a
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/logstash/config/mixin.rb
View file

@ -366,11 +366,23 @@ module LogStash::Config::Mixin
if value.size > 1 # only one value wanted
return false, "Expected number, got #{value.inspect} (type #{value.class})"
end
if value.first.to_s.to_f.to_s != value.first.to_s \
&& value.first.to_s.to_i.to_s != value.first.to_s
return false, "Expected number, got #{value.first.inspect} (type #{value.first})"
end
result = value.first.to_i
v = value.first
case v
when Numeric
result = v
when String
if v.to_s.to_f.to_s != v.to_s \
&& v.to_s.to_i.to_s != v.to_s
return false, "Expected number, got #{v.inspect} (type #{v})"
end
if v.include?(".")
# decimal value, use float.
result = v.to_f
else
result = v.to_i
end
end # case v
when :boolean
if value.size > 1 # only one value wanted
return false, "Expected boolean, got #{value.inspect}"