Fix close behavior #90
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lib/logstash/outputs/s3.rb
Outdated
| rescue Exception => ex | ||
| @logger.error('upload_worker unhandled exception', :ex => ex, :backtrace => ex.backtrace) | ||
| raise LogStash::Error, 'S3: uploader thread exited unexpectedly' | ||
| end |
Contributor
There was a problem hiding this comment.
In the #upload_worker method we are dealing with the exception, I don't think we need to handle them in this one too?
Contributor
Author
There was a problem hiding this comment.
Good catch! I didn't realize that stud task worked this way :) Will remove this block.
andrewvc
force-pushed
the
fix_close_behavior
branch
2 times, most recently
from
4eaccf0 to
f9aa0e5
Compare
lib/logstash/outputs/s3.rb
Outdated
|
|
||
| case file | ||
| when LogStash::ShutdownEvent | ||
| if file.is_a? LogStash::ShutdownEvent |
Contributor
There was a problem hiding this comment.
Oops, I missed that in the first review, I think we should compare with the value of LogStash::SHUTDOWN instead of the class type.
Contributor
|
Small comment, address it and LGTM to merge. Make sure we rebase off master since there is conflict in this PR. |
andrewvc
force-pushed
the
fix_close_behavior
branch
from
f9aa0e5 to
d19c34a
Compare
andrewvc
force-pushed
the
fix_close_behavior
branch
from
d19c34a to
9cc32e6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before workers did not cleanly shutdown resulting in a potential thread leak.
Also includes the patches in #80 , it makes more sense to merge these together as this patch includes spces.