h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 02:22:56 +08:00
Code Issues Releases Wiki Activity

Fix HubClientConnector reconnecting with no delay on server-triggered error

Browse Source
This commit is contained in:
Dean Herbert 2021-07-28 20:46:02 +09:00
parent 2b107d624a
commit cd2a1af6de
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Online/HubClientConnector.cs
View File

@ -116,10 +116,7 @@ namespace osu.Game.Online
}
catch (Exception e)
{
Logger.Log($"{clientName} connection error: {e}", LoggingTarget.Network);
// retry on any failure.
await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
await handleErrorAndDelay(e, cancellationToken).ConfigureAwait(false);
}
}
}
@ -129,6 +126,15 @@ namespace osu.Game.Online
}
}
/// <summary>
/// Handles an exception and delays an async flow.
/// </summary>
private async Task handleErrorAndDelay(Exception exception, CancellationToken cancellationToken)
{
Logger.Log($"{clientName} connection error: {exception}", LoggingTarget.Network);
await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
}
private HubConnection buildConnection(CancellationToken cancellationToken)
{
var builder = new HubConnectionBuilder()
@ -155,17 +161,18 @@ namespace osu.Game.Online
return newConnection;
}
private Task onConnectionClosed(Exception? ex, CancellationToken cancellationToken)
private async Task onConnectionClosed(Exception? ex, CancellationToken cancellationToken)
{
isConnected.Value = false;
Logger.Log(ex != null ? $"{clientName} lost connection: {ex}" : $"{clientName} disconnected", LoggingTarget.Network);
if (ex != null)
await handleErrorAndDelay(ex, cancellationToken).ConfigureAwait(false);
else
Logger.Log($"{clientName} disconnected", LoggingTarget.Network);
// make sure a disconnect wasn't triggered (and this is still the active connection).
if (!cancellationToken.IsCancellationRequested)
Task.Run(connect, default);
return Task.CompletedTask;
await Task.Run(connect, default).ConfigureAwait(false);
}
private async Task disconnect(bool takeLock)