From bdacc8048803dfbf43ae713a99eba94e89ce8efb Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Mon, 9 Jul 2018 14:30:02 +0900 Subject: [PATCH] Organize initial_params Signed-off-by: Kenji Okimoto --- app/models/fluentd/setting/in_syslog.rb | 8 +++----- app/models/fluentd/setting/out_forward.rb | 3 ++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/models/fluentd/setting/in_syslog.rb b/app/models/fluentd/setting/in_syslog.rb index 9ff270c..bacc574 100644 --- a/app/models/fluentd/setting/in_syslog.rb +++ b/app/models/fluentd/setting/in_syslog.rb @@ -6,17 +6,15 @@ class Fluentd register_plugin("input", "syslog") def self.initial_params - { - bind: "0.0.0.0", - port: 5140, + params = { parse_type: "syslog", parse: { "0" => { "type" => "syslog" } - }, - protocol_type: :udp, + } } + super.compact.deep_merge(params) end def common_options diff --git a/app/models/fluentd/setting/out_forward.rb b/app/models/fluentd/setting/out_forward.rb index 2eeab4a..16b54ea 100644 --- a/app/models/fluentd/setting/out_forward.rb +++ b/app/models/fluentd/setting/out_forward.rb @@ -10,7 +10,7 @@ class Fluentd end def self.initial_params - { + params = { buffer_type: "memory", buffer: { "0" => { @@ -23,6 +23,7 @@ class Fluentd } } } + super.except(:transport).compact.deep_merge(params) end # TODO overwrite this method to support transport parameter and transport section