Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix configtest/update behaviors are mismatched #168

Merged
merged 4 commits into from
Apr 2, 2015
Merged

Fix configtest/update behaviors are mismatched #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ac4cb9
Fix configtest didn't catch syntax error
uu59 Apr 2, 2015
818e5d9
Refactor config parse processes
uu59 Apr 2, 2015
aaf4f17
Fix to parse config with embedded code
uu59 Apr 2, 2015
92d026b
Use more proper description
uu59 Apr 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/controllers/fluentd/settings_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ def set_config

def handle_dryrun
if dryrun(params[:config])
flash.now[:success] = I18n.t('messages.dryrun_is_passed')
begin
parse_config(params[:config])
flash.now[:success] = I18n.t('messages.dryrun_is_passed')
rescue Fluent::ConfigParseError => e
flash.now[:danger] = e.message
end
else
flash.now[:danger] = @fluentd.agent.log.last_error_message
end
Expand All @@ -46,6 +51,7 @@ def handle_dryrun
end

def handle_update
parse_config(params[:config])
update_config(params[:config])
redirect_to daemon_setting_path(@fluentd)
rescue Fluent::ConfigParseError => e
Expand All @@ -61,8 +67,12 @@ def dryrun(conf)
@fluentd.agent.dryrun(tmpfile.path)
end

def parse_config(conf)
# V1Parser.parse could raise exception
Fluent::Config::V1Parser.parse(conf, @fluentd.config_file, File.dirname(@fluentd.config_file), binding)
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
Expand Down
44 changes: 44 additions & 0 deletions spec/features/setting_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,48 @@
current_path.should == '/daemon/setting'
page.should have_css('pre', text: 'YET ANOTHER CONFIG')
end

describe "config" do
before do
daemon.agent.config_write conf
click_link I18n.t('terms.edit')
end

context "plain config" do
let(:conf) { <<-'CONF' }
<source>
type forward
</source>
CONF

it 'configtest' do
click_button I18n.t('terms.configtest')
page.should have_css('.alert-success')
end

it "update & restart check" do
click_button I18n.t('terms.update')
daemon.agent.config.gsub("\r\n", "\n").should == conf # CodeMirror exchange \n -> \r\n
end
end

context "embedded config" do
let(:conf) { <<-'CONF' }
<source>
type forward
id "foo#{Time.now.to_s}"
</source>
CONF

it 'configtest' do
click_button I18n.t('terms.configtest')
page.should have_css('.alert-success')
end

it "update & restart check" do
click_button I18n.t('terms.update')
daemon.agent.config.gsub("\r\n", "\n").should == conf # CodeMirror exchange \n -> \r\n
end
end
end
end