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.

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

Flush log messages when exiting #92

Merged
merged 1 commit into from
Aug 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ You can configure its behavior by passing the following options to LogStashLogge
* :drop_messages_on_flush_error - Drop messages when there is a flush error. Defaults to false.
* :drop_messages_on_full_buffer - Drop messages when the buffer is full. Defaults to true.
* :sync - Flush buffer every time a message is received (blocking). Defaults to false.
* :buffer_flush_at_exit - Flush messages when exiting the program. Defaults to true.

You can turn buffering off by setting `sync = true`.

Expand Down
7 changes: 6 additions & 1 deletion lib/logstash-logger/buffer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,14 @@ def buffer_initialize(options={})
:has_on_flush_error => self.class.method_defined?(:on_flush_error),
:has_on_full_buffer_receive => self.class.method_defined?(:on_full_buffer_receive),
:drop_messages_on_flush_error => options.fetch(:drop_messages_on_flush_error, false),
:drop_messages_on_full_buffer => options.fetch(:drop_messages_on_full_buffer, false)
:drop_messages_on_full_buffer => options.fetch(:drop_messages_on_full_buffer, false),
:flush_at_exit => options.fetch(:flush_at_exit, false)
}

if @buffer_config[:flush_at_exit]
at_exit { buffer_flush(final: true) }
end

reset_buffer
end

Expand Down
10 changes: 9 additions & 1 deletion lib/logstash-logger/device/connectable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,20 @@ def initialize(opts = {})
true
end

@buffer_flush_at_exit =
if opts.key?(:buffer_flush_at_exit)
opts.delete(:buffer_flush_at_exit)
else
true
end

buffer_initialize(
max_items: @buffer_max_items,
max_interval: @buffer_max_interval,
autoflush: @sync,
drop_messages_on_flush_error: @drop_messages_on_flush_error,
drop_messages_on_full_buffer: @drop_messages_on_full_buffer
drop_messages_on_full_buffer: @drop_messages_on_full_buffer,
flush_at_exit: @buffer_flush_at_exit
)
end

Expand Down