Delay connection closed (#69) #79
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
As described in the issue, get_message() was raising connection closed even if there were pending messages. Per Nathaniel's suggestion, the proper behavior is this: 1. If the remote endpoint closed the connection, then the local endpoint may continue reading all messages sent prior to closing. 2. If the local endpoint closed the connection, then the local endpoint may not read any more messages. I added tests for these two conditions and implemented the behavior by closing the ReceiveChannel inside the connection's `aclose()`. This requires a bit of additional exception handling inside `get_message()` and inside the reader task. One slight surprise is that the test can't be written due to the bug in #74! The client would hang because the reader task is blocked by the unconsumed messages. So I changed the channel size to 32, which allows this test to work, and I will replace this hard-coded value when I fix #74.
Pull Request Test Coverage Report for Build 79
💛 - Coveralls |
belm0
reviewed
Nov 8, 2018
* combine BytesReceived and TextReceived handlers * use join to build message rather than +=
This was referenced Nov 8, 2018
belm0
reviewed
Nov 9, 2018
* Leave the default channel size hard coded to zero. * Skip the test that requires non-zero channel size. * Fix incomplete doc string on get_message().
belm0
approved these changes
Nov 9, 2018
belm0
pushed a commit
to belm0/trio-websocket
that referenced
this pull request
Nov 9, 2018
Closed
belm0
pushed a commit
to belm0/trio-websocket
that referenced
this pull request
Nov 10, 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.
As described in the issue, get_message() was raising connection closed
even if there were pending messages. Per Nathaniel's suggestion, the
proper behavior is this:
may continue reading all messages sent prior to closing.
may not read any more messages.
I added tests for these two conditions and implemented the behavior by
closing the ReceiveChannel inside the connection's
aclose(). Thisrequires a bit of additional exception handling inside
get_message()and inside the reader task.
One slight surprise is that the test couldn't be written due to the bug
in #74! The client would hang because the reader task is blocked by
the unconsumed messages. So I changed the channel size to 32, which
allows this test to work, and I will replace this hard-coded value
when I fix #74.