Pass cancellation token to grpc reader (#2133)

asynkron · Aug 28, 2024 · b3984e1 · b3984e1
1 parent d7e9f80
commit b3984e1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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<RemoteMessage, RemoteMessage> call, string actorSystemId, CancellationTokenSource cancellationTokenSource)
+    private Task StartReader(CancellationToken combinedToken, AsyncDuplexStreamingCall<RemoteMessage, RemoteMessage> 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;