From d5d69b5dc7df70a208a8b89d49927bdef2d123a6 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Thu, 21 Jun 2018 14:15:35 +0900 Subject: [PATCH] Set argument properly Signed-off-by: Kenji Okimoto --- app/models/concerns/fluentd/setting/configurable.rb | 2 +- app/models/concerns/fluentd/setting/section_parser.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/fluentd/setting/configurable.rb b/app/models/concerns/fluentd/setting/configurable.rb index f89fd45..f2d9087 100644 --- a/app/models/concerns/fluentd/setting/configurable.rb +++ b/app/models/concerns/fluentd/setting/configurable.rb @@ -98,7 +98,7 @@ class Fluentd end def config_argument(name, type = ActiveModel::Type::Value.new, **options) - config_param(name, **options) + config_param(name, type, **options) self._argument_name = name end diff --git a/app/models/concerns/fluentd/setting/section_parser.rb b/app/models/concerns/fluentd/setting/section_parser.rb index 344ba96..3c80053 100644 --- a/app/models/concerns/fluentd/setting/section_parser.rb +++ b/app/models/concerns/fluentd/setting/section_parser.rb @@ -23,7 +23,11 @@ class Fluentd self._value_types[name] = _definition[:value_types] if _definition.key?(:value_types) self._symbolize_keys = _definition[:symbolize_keys] if _definition.key?(:symbolize_keys) else - config_param(_param_name, _definition[:type], **_definition.except(:type)) + if _definition[:argument] + config_argument(_param_name, _definition[:type], **_definition.except(:type)) + else + config_param(_param_name, _definition[:type], **_definition.except(:type)) + end end end end