Open
Conversation
added 3 commits
January 19, 2015 22:27
This rescue unnecessarily caught all exceptions. This particularly masked the ShutdownSignal exception, which would prevent Logstash from shutting down properly. This rescue isn't necessary; there is already a rescue around the function call, so this one is being removed.
When trying to shutdown logstash, the snmptrap plugin would endlessly try to restart. This change makes the plugin respond to the ShutdownSignal exception by killing the listening thread and returning. This allows Logstash to shutdown normally.
Methods have an implicit begin/end within them; there is no need to add an extra one.
|
Jenkins standing by to test this. If you aren't a maintainer, you can ignore this comment. Someone with commit access, please review this and clear it for Jenkins to run; then say 'jenkins, test it'. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Previously, when trying to shutdown logstash, the snmptrap plugin would
endlessly try to restart. This change catches the ShutdownSignal
exception, exits the listening thread and returns, allowing Logstash to
shutdown.
Moved from elastic/logstash#1534