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

setting_params should be normally

Browse Source
This commit is contained in:
uu59 2014-07-31 18:30:13 +09:00
parent 982b5b3d4e
commit cf51f165cd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/fluentd/settings/in_tail_controller.rb
View File

@ -10,7 +10,12 @@ class Fluentd::Settings::InTailController < ApplicationController
end
def after_format
@setting = Fluentd::Setting::InTail.new(setting_params)
# NOTE: pos_file form field doesn't exists before this action
attrs = setting_params
if attrs[:pos_file].blank?
attrs.merge!(pos_file: "/tmp/fluentd-#{@fluentd.id}-#{Time.now.to_i}.pos")
end
@setting = Fluentd::Setting::InTail.new(attrs)
end
def confirm
@ -46,10 +51,7 @@ class Fluentd::Settings::InTailController < ApplicationController
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
params.require(:setting).permit(:path, :format, :regexp, *Fluentd::Setting::InTail.known_formats, :tag, :rotate_wait, :pos_file, :read_from_head, :refresh_interval)
end
end