cancellation token

gencebay · gencebay · commit bfef13024987 · 2017-09-24T08:54:07.000+03:00
diff --git a/src/NetCoreStack.WebSockets.ProxyClient/ClientWebSocketConnector.cs b/src/NetCoreStack.WebSockets.ProxyClient/ClientWebSocketConnector.cs
@@ -56,7 +56,7 @@ private async Task TryConnectAsync(CancellationTokenSource cancellationTokenSour
             try
             {
                 CancellationToken token = cancellationTokenSource != null ? cancellationTokenSource.Token : CancellationToken.None;
-                await _webSocket.ConnectAsync(uri, CancellationToken.None);
+                await _webSocket.ConnectAsync(uri, token);
             }
             catch (Exception ex)
             {
@@ -84,15 +84,7 @@ public async Task ConnectAsync(CancellationTokenSource cancellationTokenSource =
 
             while (!cancellationTokenSource.IsCancellationRequested)
             {
-                try
-                {
-                    await TryConnectAsync(cancellationTokenSource);
-                }
-                catch (Exception ex)
-                {
-                    var invocatorContext = CreateInvocatorContext();
-                    ProxyLogHelper.Log(_loggerFactory, invocatorContext, "Error", ex);
-                }
+                await TryConnectAsync(cancellationTokenSource);
 
                 if (WebSocketState == WebSocketState.Open)
                 {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private async Task TryConnectAsync(CancellationTokenSource cancellationTokenSour`
`56`	`56`	`try`
`57`	`57`	`{`
`58`	`58`	`CancellationToken token = cancellationTokenSource != null ? cancellationTokenSource.Token : CancellationToken.None;`
`59`		`- await _webSocket.ConnectAsync(uri, CancellationToken.None);`
	`59`	`+ await _webSocket.ConnectAsync(uri, token);`
`60`	`60`	`}`
`61`	`61`	`catch (Exception ex)`
`62`	`62`	`{`
`@@ -84,15 +84,7 @@ public async Task ConnectAsync(CancellationTokenSource cancellationTokenSource =`
`84`	`84`
`85`	`85`	`while (!cancellationTokenSource.IsCancellationRequested)`
`86`	`86`	`{`
`87`		`- try`
`88`		`- {`
`89`		`- await TryConnectAsync(cancellationTokenSource);`
`90`		`- }`
`91`		`- catch (Exception ex)`
`92`		`- {`
`93`		`- var invocatorContext = CreateInvocatorContext();`
`94`		`- ProxyLogHelper.Log(_loggerFactory, invocatorContext, "Error", ex);`
`95`		`- }`
	`87`	`+ await TryConnectAsync(cancellationTokenSource);`
`96`	`88`
`97`	`89`	`if (WebSocketState == WebSocketState.Open)`
`98`	`90`	`{`