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

Jump to bottom

Apply modifications in pipeline to the records being passed to @ERROR label #3631

Merged
merged 3 commits into from
Feb 16, 2022
Merged

Apply modifications in pipeline to the records being passed to @ERROR label #3631

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72eabbb
Apply modifications in pipeline to the records being passed to `@Erro…
daipom Feb 14, 2022
938c999
Add testcode
daipom Feb 15, 2022
bfd84fc
Remove unneeded code
daipom Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 19 additions & 1 deletion lib/fluent/event_router.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ def emit_stream(tag, es)
if callback = find_callback
callback.call(es)
end
rescue Pipeline::OutputError => e
@emit_error_handler.handle_emits_error(tag, e.processed_es, e.internal_error)
rescue => e
@emit_error_handler.handle_emits_error(tag, es, e)
end
Expand Down Expand Up @@ -161,6 +163,17 @@ def get(key)
private

class Pipeline

class OutputError < StandardError
attr_reader :internal_error
attr_reader :processed_es

def initialize(internal_error, processed_es)
@internal_error = internal_error
@processed_es = processed_es
end
end

def initialize
@filters = []
@output = nil
Expand All @@ -178,7 +191,12 @@ def set_output(output)

def emit_events(tag, es)
processed = @optimizer.filter_stream(tag, es)
@output.emit_events(tag, processed)

begin
@output.emit_events(tag, processed)
rescue => e
raise OutputError.new(e, processed)
end
end

class FilterOptimizer
Expand Down