RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix web requests not getting correctly handled on first connection

This commit is contained in:
Dean Herbert 2018-12-17 14:29:11 +09:00
parent 0b5f3c00bf
commit 00998d5443
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 @@ private void run()
State = APIState.Online;
};
if (!handleRequest(userReq))
if (!handleRequest(userReq, out _))
{
Thread.Sleep(500);
continue;
@ -170,11 +170,15 @@ private void run()
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 @@ public void Login(string username, string password)
/// 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 @@ private bool handleRequest(APIRequest req)
}
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 @@ private bool handleRequest(APIRequest req)
log.Add(@"API level timeout exception was hit");
req.Fail(e);
return true;
return false;
}
}