socket_listener: clean up unix socket file on start & stop #2618
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
phemmer
commented
Apr 3, 2017
| @@ -40,7 +39,6 @@ func TestSocketListener_udp(t *testing.T) { | |||
| } | |||
|
|
|||
| func TestSocketListener_unix(t *testing.T) { | |||
| defer os.Remove("/tmp/telegraf_test.sock") | |||
There was a problem hiding this comment.
Dunno how I forgot about the issue when I explicitly put the removal of the file in the test code...
phemmer
commented
Apr 4, 2017
| sl := newSocketListener() | ||
| sl.ServiceAddress = "unixgram:///tmp/telegraf_test.sock" | ||
|
|
||
| acc := &testutil.Accumulator{} | ||
| err := sl.Start(acc) | ||
| require.NoError(t, err) | ||
| defer sl.Stop() |
There was a problem hiding this comment.
This was added so that the goroutines are shut down and the unix socket file removed. Otherwise they just get killed when go exits (finishes the tests), and the file is left around.
danielnelson
reviewed
Apr 4, 2017
| listener, err := net.Listen("unix", "/tmp/telegraf_test.sock") | ||
| require.NoError(t, err) | ||
| defer os.Remove("/tmp/telegraf_test.sock") |
There was a problem hiding this comment.
I think the defer needs to move upwards to ensure it is ran even if the require.NoError fails.
There was a problem hiding this comment.
Well if it errored, then the listen failed and the file wasn't created. Though it won't hurt to put it above.
calerogers
pushed a commit
to calerogers/telegraf
that referenced
this pull request
Apr 5, 2017
vlamug
pushed a commit
to vlamug/telegraf
that referenced
this pull request
May 30, 2017
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.
Includes 2 fixes for the
socket_listener:This is the critical fix. When writing, I forgot about this step :-(
On shutdown, we kill off the listener & reader goroutines by just shutting down the sockets they're using. But this was causing them to log the result as an error.
No change log entry since the plugin isn't in a released version yet.
Required for all PRs: