From 3832a7d592cfc5a91234bdddae3182ede34c20fb Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Tue, 17 Nov 2026 08:07:59 +0100 Subject: [PATCH] Hero: renderer logt per ronde hoeveel foto's wachten op varianten of volledig voorbeeld Co-Authored-By: Claude Sonnet 5.5 --- .../Repositories/HeroRepository.cs | 4 ++++ .../Services/HeroImageService.cs | 6 ++++++ .../Services/HeroRenderService.cs | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/SlpModularCms.Modules.Hero/Repositories/HeroRepository.cs b/src/SlpModularCms.Modules.Hero/Repositories/HeroRepository.cs index e6ea79f..76f7e1f 100644 --- a/src/SlpModularCms.Modules.Hero/Repositories/HeroRepository.cs +++ b/src/SlpModularCms.Modules.Hero/Repositories/HeroRepository.cs @@ -20,6 +20,8 @@ public interface IHeroRepository Task GetImageAsync(Guid id, CancellationToken cancellationToken); Task> GetImagesAsync(IReadOnlyCollection ids, CancellationToken cancellationToken); /// Images whose set is missing or does not match their focus, oldest first (tracked). + Task CountImagesAsync(CancellationToken cancellationToken); + Task> GetImagesNeedingRenderAsync(CancellationToken cancellationToken); /// Images with a complete set made before the full-frame preview existed (tracked). @@ -72,6 +74,8 @@ public class HeroRepository(HeroDbContext context) : IHeroRepository return (await context.HeroImages.ToListAsync(cancellationToken)).Where(i => wanted.Contains(i.Id)).ToList(); } + public Task CountImagesAsync(CancellationToken cancellationToken) => context.HeroImages.CountAsync(cancellationToken); + public async Task> GetImagesNeedingRenderAsync(CancellationToken cancellationToken) => (await context.HeroImages.ToListAsync(cancellationToken)).Where(HeroMapping.NeedsRender).OrderBy(i => i.CreatedAt).ToList(); diff --git a/src/SlpModularCms.Modules.Hero/Services/HeroImageService.cs b/src/SlpModularCms.Modules.Hero/Services/HeroImageService.cs index eb0f940..d2482ac 100644 --- a/src/SlpModularCms.Modules.Hero/Services/HeroImageService.cs +++ b/src/SlpModularCms.Modules.Hero/Services/HeroImageService.cs @@ -33,6 +33,9 @@ public interface IHeroImageService /// The upload is refused; see the code. Task UploadAsync(Stream upload, long declaredLength, Guid callerId, CancellationToken cancellationToken); + /// How many images exist, how many wait for their variants and how many only lack the full-frame preview (for the log). + Task<(int Total, int NeedRender, int NeedPreview)> GetRenderBacklogAsync(CancellationToken cancellationToken); + /// /// Records a changed focus (general and optionally per ratio) on a tracked image. Nothing is cut here: the caller saves /// the image together with the hero and then calls ; the background renderer cuts the new set @@ -188,6 +191,9 @@ public class HeroImageService( signal?.Notify(); } + public async Task<(int Total, int NeedRender, int NeedPreview)> GetRenderBacklogAsync(CancellationToken cancellationToken) + => (await repository.CountImagesAsync(cancellationToken), (await repository.GetImagesNeedingRenderAsync(cancellationToken)).Count, (await repository.GetImagesNeedingPreviewAsync(cancellationToken)).Count); + public async Task RenderNextPendingAsync(IReadOnlySet skip, CancellationToken cancellationToken) { var image = (await repository.GetImagesNeedingRenderAsync(cancellationToken)).FirstOrDefault(i => !skip.Contains(i.Id)); diff --git a/src/SlpModularCms.Modules.Hero/Services/HeroRenderService.cs b/src/SlpModularCms.Modules.Hero/Services/HeroRenderService.cs index 1ba2329..e437c5f 100644 --- a/src/SlpModularCms.Modules.Hero/Services/HeroRenderService.cs +++ b/src/SlpModularCms.Modules.Hero/Services/HeroRenderService.cs @@ -58,6 +58,8 @@ public sealed class HeroRenderSignal public sealed class HeroRenderService(IServiceScopeFactory scopes, HeroRenderSignal signal, IOptions media, ILogger logger) : BackgroundService { + private bool _loggedFirstPass; + protected override async Task ExecuteAsync(CancellationToken stoppingToken) { try @@ -91,6 +93,22 @@ public sealed class HeroRenderService(IServiceScopeFactory scopes, HeroRenderSig // An image that failed in this pass waits for the next pass (a minute later or the next wake-up): one difficult photo // must not hold up the others, and it is not retried straight away. var failedInThisPass = new HashSet(); + try + { + using var scope = scopes.CreateScope(); + var (total, needRender, needPreview) = await scope.ServiceProvider.GetRequiredService().GetRenderBacklogAsync(stoppingToken); + if (needRender + needPreview > 0 || !_loggedFirstPass) + { + logger.LogInformation("Hero image renderer: {Total} images, {NeedRender} waiting for their variants, {NeedPreview} lacking the full-frame preview.", total, needRender, needPreview); + } + + _loggedFirstPass = true; + } + catch (Exception exception) when (exception is not OperationCanceledException) + { + logger.LogWarning(exception, "Counting the hero images that wait for the renderer failed."); + } + while (!stoppingToken.IsCancellationRequested) { var skip = signal.GivenUp().Concat(failedInThisPass).ToHashSet();