Fix address already in use with webhooks input during reload #3206
Conversation
This file contains 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
Change HTTP lister, to implement Close() method and avoid displaying error by adding condition based on `http.ErrServerClosed` error.
danielnelson
reviewed
Sep 7, 2017
plugins/inputs/webhooks/webhooks.go
Outdated
|
|
||
| ln, err := net.Listen("tcp", fmt.Sprintf("%s", wb.ServiceAddress)) | ||
| if err != nil { | ||
| acc.AddError(fmt.Errorf("E! Error starting server: %v", err)) |
There was a problem hiding this comment.
I think we should return this error, making it fatal and preventing Telegraf from starting. This probably indicates the port is in use or a privilege issue, and won't resolve, so I think exit is the right action even though it is technically a change in behavior.
plugins/inputs/webhooks/webhooks.go
Outdated
| err := http.ListenAndServe(fmt.Sprintf("%s", wb.ServiceAddress), r) | ||
| if err != nil { | ||
| acc.AddError(fmt.Errorf("E! Error starting server: %v", err)) | ||
| func (wb *Webhooks) listen(ln net.Listener, acc telegraf.Accumulator) { |
There was a problem hiding this comment.
Lets call this serve since we are already listening.
There was a problem hiding this comment.
Or just inline it in the Start func.
danielnelson
changed the title
Move content of listen() function to inline function inside Start() function. Report fatal and return from Start() function (exit program) in case where net.Listen() has any problem.
|
@dankans thanks! |
|
Thanks @danielnelson and @francois2metz for help! |
maxunt
pushed a commit
that referenced
this pull request
Jun 26, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change HTTP listener by removing
ListenAndServe()method and implementingClose() net.Listen()methods.Change error reporting, by disabling adding it in case when
http.ErrServerClosedoccurred.Required for all PRs: