From df1773c26f8aa65dd100e204edc8bb3cd2b24dfe Mon Sep 17 00:00:00 2001 From: uu59 Date: Tue, 29 Jul 2014 14:03:56 +0900 Subject: [PATCH] Remove dead code --- .../fluentd/settings_controller.rb | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/app/controllers/fluentd/settings_controller.rb b/app/controllers/fluentd/settings_controller.rb index 3f37028..00a5e21 100644 --- a/app/controllers/fluentd/settings_controller.rb +++ b/app/controllers/fluentd/settings_controller.rb @@ -15,54 +15,4 @@ class Fluentd::SettingsController < ApplicationController @fluentd.agent.restart if @fluentd.agent.running? redirect_to daemon_setting_path(@fluentd) end - - def in_tail_after_file_choose - @setting = Fluentd::Setting::InTail.new({ - :path => params[:path], - :tag => nil, - }) - end - - def in_tail_after_format - @setting = Fluentd::Setting::InTail.new(setting_params) - end - - def in_tail_confirm - @setting = Fluentd::Setting::InTail.new(setting_params) - if params[:back] - return render :in_tail_after_file_choose - end - unless @setting.valid? - return render :in_tail_after_format - end - end - - def in_tail_finish - @setting = Fluentd::Setting::InTail.new(setting_params) - if params[:back] - return render :in_tail_after_format - end - - unless @setting.valid? - return render "in_tail_after_format" - end - - if @fluentd.agent.configuration.to_s.include?(@setting.to_conf.strip) - @setting.errors.add(:base, :duplicated_conf) - return render "in_tail_after_format" - end - - @fluentd.agent.config_append @setting.to_conf - @fluentd.agent.restart if @fluentd.agent.running? - redirect_to daemon_setting_path(@fluentd) - end - - private - - def setting_params - setting_params = params.require(:setting).permit(:path, :format, :regexp, *Fluentd::Setting::InTail.known_formats, :tag, :rotate_wait, :pos_file, :read_from_head, :refresh_interval) - { - :pos_file => "/tmp/fluentd-#{@fluentd.id}-#{Time.now.to_i}.pos", - }.merge setting_params - end end