mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-19 21:41:11 +02:00
Code Issues Projects Releases Wiki Activity

Fix label handling while validation

Browse Source 
Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
This commit is contained in:
Kenji Okimoto 2018-09-13 17:06:23 +09:00
parent 07cbac40eb
commit f66929bf5b
No known key found for this signature in database
GPG Key ID: F9E3E329A5C5E4A1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/concerns/fluentd/setting/plugin_config.rb
View File

@ -10,7 +10,12 @@ class Fluentd
def validate_configuration def validate_configuration
original_log = $log original_log = $log
$log = DummyLogger.logger $log = DummyLogger.logger
config = to_config.to_s.lines[1..-2].join full_config = to_config.to_s
config = if full_config.start_with?("<label ")
full_config.lines[2..-3].join
else
full_config.lines[1..-2].join
end
self.class.create_driver(config) self.class.create_driver(config)
rescue Fluent::ConfigError => ex rescue Fluent::ConfigError => ex
errors.add(:base, :invalid, message: ex.message) errors.add(:base, :invalid, message: ex.message)