Skip to content

Fix the issue when the client prematurely closes and the server canno… #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pekkah merged 4 commits into from
Nov 12, 2018
Merged

Fix the issue when the client prematurely closes and the server canno… #177

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fb74c2
Fix the issue when the client prematurely closes and the server canno…
Nov 8, 2018
2419e66
Fix the issue when the client prematurely closed. Add a try/finally b…
Nov 8, 2018
b44d50b
Fixed formatting (spaces instead of tabs)
Nov 12, 2018
fd6fbac
Fixed formatting (spaces instead of tabs)- take 2
Nov 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions src/Transports.Subscriptions.WebSockets/WebSocketReaderPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,23 @@ public void LinkTo(ITargetBlock<OperationMessage> target)

public async Task Complete(WebSocketCloseStatus closeStatus, string statusDescription)
{
if (_socket.State != WebSocketState.Closed && _socket.State != WebSocketState.CloseSent)
if (_socket.State != WebSocketState.Closed && _socket.State != WebSocketState.CloseSent)
try
{
if (closeStatus == WebSocketCloseStatus.NormalClosure)
{
// If nothing went wrong, close connection with handshakes.
await _socket.CloseOutputAsync(
closeStatus,
statusDescription,
CancellationToken.None);
}
else
{
// Something went wrong, so don't wait for answer from the other side, just close the connection.
await _socket.CloseAsync(
closeStatus,
statusDescription,
CancellationToken.None);
}

_startBlock.Complete();
if (closeStatus == WebSocketCloseStatus.NormalClosure)
await _socket.CloseAsync(
closeStatus,
statusDescription,
CancellationToken.None);
else
await _socket.CloseOutputAsync(
closeStatus,
statusDescription,
CancellationToken.None);
}
finally
{
_startBlock.Complete();
}
}

Expand Down