h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 18:13:09 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25300 from peppy/better-submission-logging

Browse Source 
Improve log output surrounding score submission
This commit is contained in:
Bartłomiej Dach 2023-10-30 09:04:06 +01:00 committed by GitHub
commit 19d10e5e45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/API/APIRequest.cs
View File

@ -7,6 +7,7 @@ using System;
using System.Globalization; using System.Globalization;
using JetBrains.Annotations; using JetBrains.Annotations;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.IO.Network; using osu.Framework.IO.Network;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Game.Extensions; using osu.Game.Extensions;
@ -46,7 +47,7 @@ namespace osu.Game.Online.API
if (WebRequest != null) if (WebRequest != null)
{ {
Response = ((OsuJsonWebRequest<T>)WebRequest).ResponseObject; Response = ((OsuJsonWebRequest<T>)WebRequest).ResponseObject;
Logger.Log($"{GetType()} finished with response size of {WebRequest.ResponseStream.Length:#,0} bytes", LoggingTarget.Network); Logger.Log($"{GetType().ReadableName()} finished with response size of {WebRequest.ResponseStream.Length:#,0} bytes", LoggingTarget.Network);
} }
} }

8
osu.Game/Screens/Play/SubmittingPlayer.cs
View File

@ -188,7 +188,10 @@ namespace osu.Game.Screens.Play
{ {
// token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure). // token may be null if the request failed but gameplay was still allowed (see HandleTokenRetrievalFailure).
if (token == null) if (token == null)
{
Logger.Log("No token, skipping score submission");
return Task.CompletedTask; return Task.CompletedTask;
}
if (scoreSubmissionSource != null) if (scoreSubmissionSource != null)
return scoreSubmissionSource.Task; return scoreSubmissionSource.Task;
@ -197,6 +200,8 @@ namespace osu.Game.Screens.Play
if (!score.ScoreInfo.Statistics.Any(s => s.Key.IsHit() && s.Value > 0)) if (!score.ScoreInfo.Statistics.Any(s => s.Key.IsHit() && s.Value > 0))
return Task.CompletedTask; return Task.CompletedTask;
Logger.Log($"Beginning score submission (token:{token.Value})...");
scoreSubmissionSource = new TaskCompletionSource<bool>(); scoreSubmissionSource = new TaskCompletionSource<bool>();
var request = CreateSubmissionRequest(score, token.Value); var request = CreateSubmissionRequest(score, token.Value);
@ -206,11 +211,12 @@ namespace osu.Game.Screens.Play
score.ScoreInfo.Position = s.Position; score.ScoreInfo.Position = s.Position;
scoreSubmissionSource.SetResult(true); scoreSubmissionSource.SetResult(true);
Logger.Log($"Score submission completed! (token:{token.Value} id:{s.ID})");
}; };
request.Failure += e => request.Failure += e =>
{ {
Logger.Error(e, $"Failed to submit score ({e.Message})"); Logger.Error(e, $"Failed to submit score (token:{token.Value}): {e.Message}");
scoreSubmissionSource.SetResult(false); scoreSubmissionSource.SetResult(false);
}; };