Refactoring: out_td rely on Fluentd::Setting::Common

This commit is contained in:
uu59 2014-07-14 15:33:54 +09:00
parent d47b60a953
commit fec145a9d6
2 changed files with 22 additions and 58 deletions

View File

@ -12,30 +12,20 @@ class Fluentd
attr_accessor(*KEYS) attr_accessor(*KEYS)
booleans :use_ssl
flags :auto_create_table
validates :match, presence: true validates :match, presence: true
validates :api_key, presence: true validates :apikey, presence: true
validates :auto_create_table, presence: true validates :auto_create_table, presence: true
validates :use_ssl, presence: true validates :use_ssl, presence: true
def to_conf def plugin_name
<<-XML.strip_heredoc.gsub(/^[ ]*\n/m, "") "tdlog"
<match #{match}> end
type tdlog
#{print_if_present :apikey}
#{auto_create_table.present? ? "auto_create_table" : ""}
use_ssl #{use_ssl.present? ? "true" : "false"}
#{print_if_present :database}
#{print_if_present :table}
#{print_if_present :endpoint}
#{print_if_present :connect_timeout} def to_conf
#{print_if_present :read_timeout} to_config
#{print_if_present :send_timeout}
#{print_if_present :flush_interval}
#{print_if_present :buffer_type}
#{print_if_present :buffer_path}
</match>
XML
end end
end end
end end

View File

@ -2,51 +2,25 @@
= msg = msg
= form_for(@setting, url: finish_fluentd_setting_out_td_path(@fluentd), html: {class: "ignore-rails-error-div"}) do |f| = form_for(@setting, url: finish_fluentd_setting_out_td_path(@fluentd), html: {class: "ignore-rails-error-div"}) do |f|
.form-group = field(f, :match)
= f.label :match = field(f, :apikey)
= f.text_field :match = field(f, :auto_create_table)
.form-group = field(f, :use_ssl)
= f.label :apikey = field(f, :database)
= f.text_field :apikey = field(f, :table)
.form-group = field(f, :endpoint)
= f.label :auto_create_table
= f.check_box :auto_create_table, {}, "true", "false"
.form-group
= f.label :use_ssl
= f.check_box :use_ssl, {}, "true", "false"
.form-group
= f.label :database
= f.text_field :database
.form-group
= f.label :table
= f.text_field :table
.form-group
= f.label :endpoint
= f.text_field :endpoint
.well.well-sm .well.well-sm
%h4{"data-toggle" => "collapse", "href" => "#advanced-setting"} %h4{"data-toggle" => "collapse", "href" => "#advanced-setting"}
= icon('fa-caret-down') = icon('fa-caret-down')
= t('terms.advanced_setting') = t('terms.advanced_setting')
#advanced-setting.collapse #advanced-setting.collapse
.form-group = field(f, :connect_timeout)
= f.label :connect_timeout = field(f, :read_timeout)
= f.text_field :connect_timeout = field(f, :send_timeout)
.form-group = field(f, :flush_interval)
= f.label :read_timeout = field(f, :buffer_type)
= f.text_field :read_timeout = field(f, :buffer_path)
.form-group
= f.label :send_timeout
= f.text_field :send_timeout
.form-group
= f.label :flush_interval
= f.text_field :flush_interval
.form-group
= f.label :buffer_type
= f.text_field :buffer_type
.form-group
= f.label :buffer_path
= f.text_field :buffer_path
= f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right" = f.submit t('fluentd.common.finish') , class: "btn btn-lg btn-primary pull-right"
= f.submit t('terms.prev'), class: "btn btn-lg btn-default", name: "back" = f.submit t('terms.prev'), class: "btn btn-lg btn-default", name: "back"