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

accept hashes for the :hash validator

Browse source 
The configuration system coerced arrays into hashes, but YAML passes hashes
directly. We should attempt no coercion on them.
This commit is contained in:
Stephon Striplin 2012-11-28 12:16:54 -08:00
parent 7c74bcce15
commit 6e6f68ff62
1 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -302,25 +302,29 @@ module LogStash::Config::Mixin
elsif validator.is_a?(Symbol)
# TODO(sissel): Factor this out into a coersion method?
# TODO(sissel): Document this stuff.
value = [*value] # coerce scalar to array if necessary
value = hash_or_array(value)
case validator
when :hash
if value.size % 2 == 1
return false, "This field must contain an even number of items, got #{value.size}"
end
if value.is_a?(Hash)
result = value
else
if value.size % 2 == 1
return false, "This field must contain an even number of items, got #{value.size}"
end
# Convert the array the config parser produces into a hash.
result = {}
value.each_slice(2) do |key, value|
entry = result[key]
if entry.nil?
result[key] = value
else
if entry.is_a?(Array)
entry << value
# Convert the array the config parser produces into a hash.
result = {}
value.each_slice(2) do |key, value|
entry = result[key]
if entry.nil?
result[key] = value
else
result[key] = [entry, value]
if entry.is_a?(Array)
entry << value
else
result[key] = [entry, value]
end
end
end
end
@ -385,5 +389,12 @@ module LogStash::Config::Mixin
# Return the validator for later use, like with type coercion.
return true, result
end # def validate_value
def hash_or_array(value)
if !value.is_a?(Hash)
value = [*value] # coerce scalar to array if necessary
end
return value
end
end # module LogStash::Config::DSL
end # module LogStash::Config