Skip to content

Commit

Permalink
suppress duplicated warning log when dry-run mode
Browse files Browse the repository at this point in the history
current impl shows all warning log when dry-run mode

Signed-off-by: Yuta Iwama <[email protected]>
  • Loading branch information
ganmacs committed Oct 15, 2019
1 parent d08fee6 commit 002d20c
Showing 1 changed file with 25 additions and 13 deletions.
38 changes: 25 additions & 13 deletions lib/fluent/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def initialize
attr_reader :matches, :sources
attr_reader :system_config

attr_reader :supervisor_mode, :dry_run_mode
attr_writer :dry_run_mode
attr_reader :supervisor_mode
attr_accessor :dry_run_mode

def init(system_config, supervisor: false)
@system_config = system_config
Expand Down Expand Up @@ -103,21 +103,14 @@ def run_configure(conf)
else
"section <#{e.name}> is not used in <#{parent_name}>"
end
if e.for_every_workers?
$log.warn :worker0, message
elsif e.for_this_worker?(Fluent::Engine.worker_id)
$log.warn message
end

log_configure(e, message)
next
end

unless e.name == 'system'
unless @without_source && e.name == 'source'
message = "parameter '#{key}' in #{e.to_s.strip} is not used."
if e.for_every_workers?
$log.warn :worker0, message
elsif e.for_this_worker?(Fluent::Engine.worker_id)
$log.warn message
end
log_configure(e, "parameter '#{key}' in #{e.to_s.strip} is not used.")
end
end
}
Expand Down Expand Up @@ -271,6 +264,25 @@ def worker_id
end

private

def log_configure(elem, message)
if @supervisor_mode
if @dry_run_mode
$log.warn(message)
end

return
end

if elem.for_every_workers?
$log.warn(:worker0, message)
elsif elem.for_this_worker?(worker_id)
$log.warn(message)
else
# ignore
end
end

def start
@root_agent.start
end
Expand Down

0 comments on commit 002d20c

Please sign in to comment.