mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2026-05-05 10:56:11 +02:00
Code Issues Projects Releases Wiki Activity

Refactor config parse processes

Browse Source
This commit is contained in:
uu59 2015-04-02 11:45:43 +09:00
parent 8ac4cb9526
commit 818e5d96bf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/fluentd/settings_controller.rb
View File

@ -38,7 +38,7 @@ class Fluentd::SettingsController < ApplicationController
def handle_dryrun
if dryrun(params[:config])
begin
parse_test(params[:config])
parse_config(params[:config])
flash.now[:success] = I18n.t('messages.dryrun_is_passed')
rescue Fluent::ConfigParseError => e
flash.now[:danger] = e.message
@ -51,6 +51,7 @@ class Fluentd::SettingsController < ApplicationController
end
def handle_update
parse_config(params[:config])
update_config(params[:config])
redirect_to daemon_setting_path(@fluentd)
rescue Fluent::ConfigParseError => e
@ -66,12 +67,12 @@ class Fluentd::SettingsController < ApplicationController
@fluentd.agent.dryrun(tmpfile.path)
end
def parse_test(conf)
Fluent::Config::V1Parser.parse(params[:config], @fluentd.config_file)
def parse_config(conf)
# V1Parser.parse could raise exception
Fluent::Config::V1Parser.parse(conf, @fluentd.config_file)
end
def update_config(conf)
Fluent::Config::V1Parser.parse(conf, @fluentd.config_file)
@fluentd.agent.config_write conf
@fluentd.agent.restart if @fluentd.agent.running?
end