From c7695cf0b3060b485828a0d76a5958fcac960076 Mon Sep 17 00:00:00 2001
From: Kenji Okimoto <okimoto@clear-code.com>
Date: Fri, 8 Jun 2018 13:21:50 +0900
Subject: [PATCH] Fix errors

* format -> parse_type
* to_conf -> to_config
* stub some code

Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
---
 app/views/fluentd/settings/in_tail/_form.html.haml  | 13 ++++++-------
 .../settings/in_tail/after_file_choose.html.haml    |  2 +-
 .../fluentd/settings/in_tail/confirm.html.haml      |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/fluentd/settings/in_tail/_form.html.haml b/app/views/fluentd/settings/in_tail/_form.html.haml
index df3f1f5..d93184e 100644
--- a/app/views/fluentd/settings/in_tail/_form.html.haml
+++ b/app/views/fluentd/settings/in_tail/_form.html.haml
@@ -6,17 +6,17 @@
   = f.hidden_field :path
   = f.text_field :path, class: "form-control", disabled: true
 .form-group
-  = f.label :format
-  = f.hidden_field :format
-  = f.text_field :format, class: "form-control", disabled: true
-- if @setting.known_formats[@setting.format.to_sym]
-  - @setting.known_formats[@setting.format.to_sym].each do |key|
+  = f.label :parse_type
+  = f.hidden_field :parse_type
+  = f.text_field :parse_type, class: "form-control", disabled: true
+- if @setting.known_formats[@setting.parse_type&.to_sym || "syslog"]
+  - @setting.known_formats[@setting.parse_type&.to_sym || "syslog"].each do |key|
     %label= key
     = f.hidden_field key
     = @setting.send(key)
     %br
 - else
-  %label= @setting.format
+  %label= @setting.parse_type
   = f.hidden_field :regexp
   = @setting.regexp
 .form-group
@@ -39,4 +39,3 @@
     .form-group
       = f.label :refresh_interval
       = f.text_field :refresh_interval, class: "form-control"
-
diff --git a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
index 74834d9..73866fb 100644
--- a/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
+++ b/app/views/fluentd/settings/in_tail/after_file_choose.html.haml
@@ -10,7 +10,7 @@
     = f.label :path
     = f.hidden_field :path
     = f.text_field :path, class: "form-control", disabled: true
-  = render partial: "shared/vue/in_tail_format", locals: { file: f.object.path, formats: @setting.known_formats, initialSelected: f.object.format || @setting.guess_format }
+  = render partial: "shared/vue/in_tail_format", locals: { file: f.object.path, formats: @setting.known_formats, initialSelected: f.object.parse_type || @setting.guess_format }
 
   .card
     %pre.card-body= file_tail(@setting.path, Settings.in_tail_preview_line_count).join("\n")
diff --git a/app/views/fluentd/settings/in_tail/confirm.html.haml b/app/views/fluentd/settings/in_tail/confirm.html.haml
index 76748a1..ae5aa16 100644
--- a/app/views/fluentd/settings/in_tail/confirm.html.haml
+++ b/app/views/fluentd/settings/in_tail/confirm.html.haml
@@ -5,7 +5,7 @@
 = form_for(@setting, as: "setting", url: finish_daemon_setting_in_tail_path(@fluentd)) do |f|
   = render partial: "form", locals: { f: f }
 
-  %pre= @setting.to_conf
+  %pre= @setting.to_config
 
   %p
     = f.submit t('fluentd.common.finish')   , class: "btn btn-lg btn-primary float-right"