mirrors/fluentd-ui
1
0
Fork 0
mirror of https://github.com/fluent/fluentd-ui.git synced 2025-08-11 16:57:11 +02:00
Code Issues Projects Releases Wiki Activity

Use Fluentd::Agent::Common#config_merge

Browse Source 
Signed-off-by: Kenji Okimoto <okimoto@clear-code.com>
This commit is contained in:
Kenji Okimoto 2018-09-13 15:49:29 +09:00
parent 82c62df65b
commit cba4a89668
No known key found for this signature in database
GPG Key ID: F9E3E329A5C5E4A1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/setting_concern.rb
View File

@ -23,7 +23,7 @@ module SettingConcern
return render "shared/settings/show" return render "shared/settings/show"
end end
@fluentd.agent.config_append @setting.to_config @fluentd.agent.config_merge(@setting.to_config.to_s)
if @fluentd.agent.running? if @fluentd.agent.running?
unless @fluentd.agent.restart unless @fluentd.agent.restart
@setting.errors.add(:base, @fluentd.agent.log.tail(1).first) @setting.errors.add(:base, @fluentd.agent.log.tail(1).first)