From e1519f2497f7e1cd6686c1c62dce3223a1ac49bb Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 9 Oct 2022 15:23:29 +0200 Subject: [PATCH] add some debugging info --- .../Services/GrpcClientIdentificationService.cs | 4 ++-- .../Identity/IdentityService.cs | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs b/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs index 7f35c86..a587af5 100644 --- a/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs +++ b/MareSynchronosServer/MareSynchronosServer/Services/GrpcClientIdentificationService.cs @@ -180,7 +180,7 @@ public class GrpcClientIdentificationService : IHostedService { try { - var stream = _grpcIdentClient.SendStreamIdentStatusChange(cancellationToken: cts); + using var stream = _grpcIdentClient.SendStreamIdentStatusChange(cancellationToken: cts); await stream.RequestStream.WriteAsync(new IdentChangeMessage() { Server = new ServerMessage() @@ -212,7 +212,7 @@ public class GrpcClientIdentificationService : IHostedService { try { - var stream = _grpcIdentClient.ReceiveStreamIdentStatusChange(new ServerMessage() + using var stream = _grpcIdentClient.ReceiveStreamIdentStatusChange(new ServerMessage() { ServerId = _shardName, }); diff --git a/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs b/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs index 4e88599..3637237 100644 --- a/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs +++ b/MareSynchronosServer/MareSynchronosServices/Identity/IdentityService.cs @@ -103,17 +103,16 @@ internal class IdentityService : IdentificationService.IdentificationServiceBase try { - while (true) + while (!context.CancellationToken.IsCancellationRequested) { - if (identChanges.ContainsKey(server) && identChanges[server].TryDequeue(out var cur)) + while (identChanges.ContainsKey(server) && identChanges[server].TryDequeue(out var cur)) { _logger.LogInformation("Sending " + cur.UidWithIdent.Uid.Uid + " to " + server); await responseStream.WriteAsync(cur).ConfigureAwait(false); } - else - { - await Task.Delay(10).ConfigureAwait(false); - } + + _logger.LogInformation("Queue for " + server + " is empty: " + identChanges[server].IsEmpty); + await Task.Delay(10).ConfigureAwait(false); } } catch