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

[backend] Improve logging for unknown activity types

Browse source
This commit is contained in:
Laura Hausmann 2024-02-06 20:55:18 +01:00
parent ec561706d6
commit 333ef6f7cd
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Iceshrimp.Backend/Core/Queues/InboxQueue.cs
View file

@ -1,6 +1,7 @@
using Iceshrimp.Backend.Core.Federation.ActivityPub; using Iceshrimp.Backend.Core.Federation.ActivityPub;
using Iceshrimp.Backend.Core.Federation.ActivityStreams; using Iceshrimp.Backend.Core.Federation.ActivityStreams;
using Iceshrimp.Backend.Core.Federation.ActivityStreams.Types; using Iceshrimp.Backend.Core.Federation.ActivityStreams.Types;
using Iceshrimp.Backend.Core.Middleware;
using Iceshrimp.Backend.Core.Services; using Iceshrimp.Backend.Core.Services;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using ProtoBuf; using ProtoBuf;
@ -22,7 +23,9 @@ public class InboxQueue {
if (expanded == null) throw new Exception("Failed to expand ASObject"); if (expanded == null) throw new Exception("Failed to expand ASObject");
var obj = ASObject.Deserialize(expanded); var obj = ASObject.Deserialize(expanded);
if (obj == null) throw new Exception("Failed to deserialize ASObject"); if (obj == null) throw new Exception("Failed to deserialize ASObject");
if (obj is not ASActivity activity) throw new NotImplementedException("Job data is not an ASActivity"); if (obj is not ASActivity activity) {
throw new GracefulException("Job data is not an ASActivity", $"Type: {obj.Type}");
}
var apHandler = scope.GetRequiredService<ActivityHandlerService>(); var apHandler = scope.GetRequiredService<ActivityHandlerService>();
var logger = scope.GetRequiredService<ILogger<InboxQueue>>(); var logger = scope.GetRequiredService<ILogger<InboxQueue>>();

9
Iceshrimp.Backend/Core/Services/QueueService.cs
View file

@ -1,5 +1,6 @@
using Iceshrimp.Backend.Core.Configuration; using Iceshrimp.Backend.Core.Configuration;
using Iceshrimp.Backend.Core.Helpers; using Iceshrimp.Backend.Core.Helpers;
using Iceshrimp.Backend.Core.Middleware;
using Iceshrimp.Backend.Core.Queues; using Iceshrimp.Backend.Core.Queues;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using ProtoBuf; using ProtoBuf;
@ -98,7 +99,13 @@ public class JobQueue<T>(
job.ExceptionSource = e.TargetSite?.DeclaringType?.FullName ?? "Unknown"; job.ExceptionSource = e.TargetSite?.DeclaringType?.FullName ?? "Unknown";
var logger = scope.ServiceProvider.GetRequiredService<ILogger<QueueService>>(); var logger = scope.ServiceProvider.GetRequiredService<ILogger<QueueService>>();
logger.LogError("Failed to process job in {queue} queue: {error}", name, e.Message); if (e is GracefulException { Details: not null } ce) {
logger.LogError("Failed to process job in {queue} queue: {error} - {details}",
name, ce.Message, ce.Details);
}
else {
logger.LogError("Failed to process job in {queue} queue: {error}", name, e.Message);
}
} }
if (job.Status is Job.JobStatus.Failed) { if (job.Status is Job.JobStatus.Failed) {