diff --git a/src/Proto.Remote/Endpoints/ServerConnector.cs b/src/Proto.Remote/Endpoints/ServerConnector.cs index 10f4f9f197..b061295adb 100644 --- a/src/Proto.Remote/Endpoints/ServerConnector.cs +++ b/src/Proto.Remote/Endpoints/ServerConnector.cs @@ -174,7 +174,7 @@ await call.RequestStream.WriteAsync(new RemoteMessage var writer = StartWriter(combinedToken, call, cancellationTokenSource); - var reader = StartReader(call, actorSystemId, cancellationTokenSource); + var reader = StartReader(combinedToken, call, actorSystemId, cancellationTokenSource); _logger.LogInformation("[ServerConnector][{SystemAddress}] Connected to {Address}", _system.Address, _address); @@ -299,13 +299,13 @@ private Task StartWriter(CancellationToken combinedToken, AsyncDuplexStreamingCa }); } - private Task StartReader(AsyncDuplexStreamingCall call, string actorSystemId, CancellationTokenSource cancellationTokenSource) + private Task StartReader(CancellationToken combinedToken, AsyncDuplexStreamingCall call, string actorSystemId, CancellationTokenSource cancellationTokenSource) { return Task.Run(async () => { try { - while (await call.ResponseStream.MoveNext().ConfigureAwait(false)) + while (await call.ResponseStream.MoveNext(combinedToken).ConfigureAwait(false)) { // if (_endpoint.CancellationToken.IsCancellationRequested) continue; var currentMessage = call.ResponseStream.Current;