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

[backend/core] Fix queue system logging rendering UTC timestamps & reporting of incorrect duration for delayed jobs due to time zone differences

Browse source
This commit is contained in:
Laura Hausmann 2024-03-26 12:06:12 +01:00
parent 7eba307d0a
commit 5556832de0
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Iceshrimp.Backend/Core/Database/Tables/Job.cs
View file

@ -34,7 +34,7 @@ public class Job
[Column("data")] public string Data { get; set; } = null!; [Column("data")] public string Data { get; set; } = null!;
[NotMapped] [NotMapped]
public long Duration => (long)((FinishedAt ?? DateTime.Now) - (StartedAt ?? QueuedAt)).TotalMilliseconds; public long Duration => (long)((FinishedAt ?? DateTime.UtcNow) - (StartedAt ?? QueuedAt)).TotalMilliseconds;
[NotMapped] public long QueueDuration => (long)((StartedAt ?? DateTime.Now) - QueuedAt).TotalMilliseconds; [NotMapped] public long QueueDuration => (long)((StartedAt ?? DateTime.UtcNow) - QueuedAt).TotalMilliseconds;
} }

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

@ -348,8 +348,8 @@ public class PostgresJobQueue<T>(
{ {
var logger = scope.ServiceProvider.GetRequiredService<ILogger<QueueService>>(); var logger = scope.ServiceProvider.GetRequiredService<ILogger<QueueService>>();
logger.LogTrace("Job in queue {queue} was delayed to {time} after {duration} ms, has been queued since {time}", logger.LogTrace("Job in queue {queue} was delayed to {time} after {duration} ms, has been queued since {time}",
name, job.DelayedUntil.Value.ToStringIso8601Like(), job.Duration, name, job.DelayedUntil.Value.ToLocalTime().ToStringIso8601Like(), job.Duration,
job.QueuedAt.ToStringIso8601Like()); job.QueuedAt.ToLocalTime().ToStringIso8601Like());
db.Update(job); db.Update(job);
await db.SaveChangesAsync(token); await db.SaveChangesAsync(token);
await RaiseJobDelayedEvent(db); await RaiseJobDelayedEvent(db);