notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/federation] Don't mark client error deliver jobs as successful

Browse source
This commit is contained in:
Laura Hausmann 2024-06-23 14:45:04 +02:00
parent d5a5a3d464
commit 583e954106
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Iceshrimp.Backend/Core/Extensions/HttpResponseExtensions.cs
View file

@ -10,10 +10,12 @@ public static class HttpResponseExtensions
public static bool IsRetryableClientError(this HttpResponseMessage res)
=> res.StatusCode is HttpStatusCode.TooManyRequests;
public static void EnsureSuccessStatusCode(this HttpResponseMessage res, bool excludeClientErrors)
public static void EnsureSuccessStatusCode(
this HttpResponseMessage res, bool excludeClientErrors, Func<Exception> exceptionFactory
)
{
if (excludeClientErrors && res.IsClientError() && !res.IsRetryableClientError())
return;
throw exceptionFactory();
res.EnsureSuccessStatusCode();
}
}

10
Iceshrimp.Backend/Core/Queues/DeliverQueue.cs
View file

@ -1,3 +1,4 @@
using System.Net;
using Iceshrimp.Backend.Core.Database;
using Iceshrimp.Backend.Core.Database.Tables;
using Iceshrimp.Backend.Core.Extensions;
@ -54,9 +55,9 @@ public class DeliverQueue(int parallelism)
(int)response.StatusCode, !response.IsSuccessStatusCode);
});
response.EnsureSuccessStatusCode(true);
response.EnsureSuccessStatusCode(true, () => new ClientError(response.StatusCode));
}
catch (Exception e)
catch (Exception e) when (e is not ClientError)
{
if (job.RetryCount++ < 10)
{
@ -81,6 +82,11 @@ public class DeliverQueue(int parallelism)
}
}
}
public class ClientError(HttpStatusCode statusCode) : Exception
{
public HttpStatusCode StatusCode => statusCode;
}
}
public class DeliverJobData