t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

whitelist fixes, grpc stream fixes

Browse Source
This commit is contained in:
Stanley Dimant
2022-10-20 23:08:46 +02:00
parent e3e07fe117
commit 8164d737bf
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MareSynchronosServer/MareSynchronosShared/Services/GrpcBaseService.cs
View File

@@ -39,15 +39,16 @@ public abstract class GrpcBaseService : IHostedService, IDisposable
private async Task RestartStreams()
{
_streamCts?.Cancel();
_streamCts?.Dispose();
_streamCts = new();
if (!GrpcIsFaulty)
{
_streamCts?.Cancel();
_streamCts?.Dispose();
_streamCts = new();
var token = _streamCts.Token;
try
{
await PreStartStream().ConfigureAwait(false);
await StartStream(_streamCts.Token).ConfigureAwait(false);
await StartStream(token).ConfigureAwait(false);
await PostStartStream().ConfigureAwait(false);
}
catch
@@ -74,7 +75,11 @@ public abstract class GrpcBaseService : IHostedService, IDisposable
{
await CheckFaultStateAndRestore().ConfigureAwait(false);
}
catch { SetGrpcFaulty(); }
catch
{
SetGrpcFaulty();
await Task.Delay(5000, ct).ConfigureAwait(false);
}
await Task.Delay(250).ConfigureAwait(false);
}
}
@@ -83,10 +88,10 @@ public abstract class GrpcBaseService : IHostedService, IDisposable
{
if (GrpcIsFaulty)
{
GrpcIsFaulty = false;
await RestartStreams().ConfigureAwait(false);
await OnGrpcRestore().ConfigureAwait(false);
_logger.LogInformation("GRPC connection is restored");
GrpcIsFaulty = false;
}
}