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

Fix API getting stuck in connecting state on some exceptions

Browse Source
This commit is contained in:
Dean Herbert 2018-12-09 15:08:25 +09:00
parent dc6574a9cc
commit 7a703f9237
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,19 +196,7 @@ namespace osu.Game.Online.API
/// <returns>true if we should remove this request from the queue.</returns>
private bool handleRequest(APIRequest req)
{
try
{
Logger.Log($@"Performing request {req}", LoggingTarget.Network);
req.Perform(this);
//we could still be in initialisation, at which point we don't want to say we're Online yet.
if (IsLoggedIn)
State = APIState.Online;
failureCount = 0;
return true;
}
catch (WebException we)
bool handleWebException(WebException we)
{
HttpStatusCode statusCode = (we.Response as HttpWebResponse)?.StatusCode
?? (we.Status == WebExceptionStatus.UnknownError ? HttpStatusCode.NotAcceptable : HttpStatusCode.RequestTimeout);
@ -217,6 +205,7 @@ namespace osu.Game.Online.API
switch (we.Message)
{
case "Unauthorized":
case "Forbidden":
statusCode = HttpStatusCode.Unauthorized;
break;
}
@ -239,9 +228,40 @@ namespace osu.Game.Online.API
return true;
}
req.Fail(we);
return true;
}
try
{
Logger.Log($@"Performing request {req}", LoggingTarget.Network);
req.Failure += ex =>
{
switch (ex)
{
case WebException we:
handleWebException(we);
break;
}
};
req.Perform(this);
//we could still be in initialisation, at which point we don't want to say we're Online yet.
if (IsLoggedIn)
State = APIState.Online;
failureCount = 0;
return true;
}
catch (WebException we)
{
var removeFromQueue = handleWebException(we);
if (removeFromQueue)
req.Fail(we);
return removeFromQueue;
}
catch (Exception e)
{
if (e is TimeoutException)