h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3865 from peppy/fix-web-requests-more

Browse Source 
Fix web requests not getting correctly handled on first connection
This commit is contained in:
Dan Balasescu 2018-12-17 15:14:01 +09:00 committed by GitHub
commit 4b0cad1455
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game/Online/API/APIAccess.cs
View File

@ -141,7 +141,7 @@ namespace osu.Game.Online.API
State = APIState.Online;
};
if (!handleRequest(userReq))
if (!handleRequest(userReq, out _))
{
Thread.Sleep(500);
continue;
@ -170,11 +170,15 @@ namespace osu.Game.Online.API
lock (queue)
{
if (queue.Count == 0) break;
req = queue.Dequeue();
req = queue.Peek();
}
// TODO: handle failures better
handleRequest(req);
handleRequest(req, out var removeFromQueue);
if (removeFromQueue)
lock (queue)
queue.Dequeue();
}
Thread.Sleep(50);
@ -193,9 +197,11 @@ namespace osu.Game.Online.API
/// Handle a single API request.
/// </summary>
/// <param name="req">The request.</param>
/// <returns>true if we should remove this request from the queue.</returns>
private bool handleRequest(APIRequest req)
/// <returns>true if the request succeeded.</returns>
private bool handleRequest(APIRequest req, out bool removeFromQueue)
{
removeFromQueue = true;
try
{
Logger.Log($@"Performing request {req}", LoggingTarget.Network);
@ -216,12 +222,12 @@ namespace osu.Game.Online.API
}
catch (WebException we)
{
var removeFromQueue = handleWebException(we);
removeFromQueue = handleWebException(we);
if (removeFromQueue)
req.Fail(we);
return removeFromQueue;
return false;
}
catch (Exception e)
{
@ -229,7 +235,7 @@ namespace osu.Game.Online.API
log.Add(@"API level timeout exception was hit");
req.Fail(e);
return true;
return false;
}
}