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 missed bugs for v0.14 #988

Merged
merged 2 commits into from
May 25, 2016
+10 −4
Merged

Fix missed bugs for v0.14 #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c56a18f
assign router to output plugins only if needed
tagomoris May 24, 2016
d6245d0
fix compat buffered output plugins with renewed buffer APIs to write …
tagomoris May 24, 2016
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
2 changes: 1 addition & 1 deletion lib/fluent/agent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def add_match(type, pattern, conf)
log.info "adding match#{@context.nil? ? '' : " in #{@context}"}", pattern: pattern, type: type

output = Plugin.new_output(type)
output.router = @event_router
output.router = @event_router if output.respond_to?(:router=)
output.configure(conf)
@outputs << output
@event_router.add_rule(pattern, output)
Expand Down
12 changes: 9 additions & 3 deletions lib/fluent/compat/output.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,18 +247,24 @@ def configure(conf)

# This method overrides Fluent::Plugin::Output#handle_stream_simple
# because v0.12 BufferedOutput may overrides #format_stream, but original #handle_stream_simple method doesn't consider about it
def handle_stream_simple(tag, es)
def handle_stream_simple(tag, es, enqueue: false)
if @overrides_format_stream
meta = metadata(nil, nil, nil)
bulk = format_stream(tag, es)
@buffer.emit_bulk(meta, bulk, es.size)
size = es.size
write_guard do
@buffer.write({meta => [bulk, size]}, bulk: true, enqueue: enqueue)
end
@counters_monitor.synchronize{ @emit_records += size }
return [meta]
end

meta = metadata(nil, nil, nil)
es_size = 0
es_bulk = es.map{|time,record| es_size += 1; format(tag, time, record) }.join
@buffer.emit_bulk(meta, es_bulk, es_size)
write_guard do
@buffer.write({meta => [es_bulk, es_size]}, bulk: true, enqueue: enqueue)
end
@counters_monitor.synchronize{ @emit_records += es_size }
[meta]
end
Expand Down