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

[backend/federation] Don't retry deliver jobs that returned a client error (except for HTTP 429)

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

19
Iceshrimp.Backend/Core/Extensions/HttpResponseExtensions.cs Normal file
View file

@ -0,0 +1,19 @@
using System.Net;
namespace Iceshrimp.Backend.Core.Extensions;
public static class HttpResponseExtensions
{
public static bool IsClientError(this HttpResponseMessage res)
=> res.StatusCode is >= HttpStatusCode.BadRequest and <= (HttpStatusCode)499;
public static bool IsRetryableClientError(this HttpResponseMessage res)
=> res.StatusCode is HttpStatusCode.TooManyRequests;
public static void EnsureSuccessStatusCode(this HttpResponseMessage res, bool excludeClientErrors)
{
if (excludeClientErrors && res.IsClientError() && !res.IsRetryableClientError())
return;
res.EnsureSuccessStatusCode();
}
}

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

@ -1,5 +1,6 @@
using Iceshrimp.Backend.Core.Database;
using Iceshrimp.Backend.Core.Database.Tables;
using Iceshrimp.Backend.Core.Extensions;
using Iceshrimp.Backend.Core.Services;
using Microsoft.EntityFrameworkCore;
using J = System.Text.Json.Serialization.JsonPropertyNameAttribute;
@ -53,7 +54,7 @@ public class DeliverQueue(int parallelism)
(int)response.StatusCode, !response.IsSuccessStatusCode);
});
response.EnsureSuccessStatusCode();
response.EnsureSuccessStatusCode(true);
}
catch (Exception e)
{