Read websocket close in tail handler #1383
Merged
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
|
|
sandeepsukhani
approved these changes
Jan 2, 2020
|
Can you create an issue @sandlis and then we can merge this ? |
This comment has been minimized.
This comment has been minimized.
beornf
force-pushed
the
websocket-tail-done
branch
from
89d3d7d
to
c8030f3
Compare
|
I've done the change to gracefully terminate the logcli websocket on |
sandeepsukhani
requested changes
Jan 9, 2020
| <-stopChan | ||
| if err := conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, "")); err != nil { | ||
| log.Println("Error closing websocket:", err) | ||
| } |
There was a problem hiding this comment.
Let us add os.Exit(0) after this line since older builds won't handle this close message which makes cli program to continue running since we are handling those interrupts and waiting for the server to gracefully close the connection to break the loop down below.
There was a problem hiding this comment.
Good point about the older server builds. Since we are exiting here no need to introduce a change to the main loop anymore.
beornf
force-pushed
the
websocket-tail-done
branch
from
c8030f3
to
555e93e
Compare
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.
Added support for graceful closing of the tail query endpoint when the websocket client sends a close message. This fixes the minor issue of errors always being logged when the client disconnects i.e.
"Error writing ping message to websocket"and"Error writing close message to websocket".