AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Scanner Logging (#2997)

Browse source
This commit is contained in:
Joe Milazzo 2024-06-12 12:14:52 -05:00 • committed by GitHub
parent 094e775f0b
commit a6a60c4221
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 106 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

34
API/Services/Tasks/Scanner/ProcessSeries.cs
View file

@ -18,6 +18,7 @@ using API.Services.Tasks.Scanner.Parser;
using API.SignalR;
using Hangfire;
using Kavita.Common;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
namespace API.Services.Tasks.Scanner;
@ -189,6 +190,39 @@ public class ProcessSeries : IProcessSeries
{
await _unitOfWork.CommitAsync();
}
catch (DbUpdateConcurrencyException ex)
{
foreach (var entry in ex.Entries)
{
if (entry.Entity is Series)
{
var proposedValues = entry.CurrentValues;
var databaseValues = await entry.GetDatabaseValuesAsync();
foreach (var property in proposedValues.Properties)
{
var proposedValue = proposedValues[property];
var databaseValue = databaseValues[property];
// TODO: decide which value should be written to database
_logger.LogDebug("Property conflict, proposed: {Proposed} vs db: {Database}", proposedValue, databaseValue);
// proposedValues[property] = <value to be saved>;
}
// Refresh original values to bypass next concurrency check
entry.OriginalValues.SetValues(databaseValues);
}
}
_logger.LogCritical(ex,
"[ScannerService] There was an issue writing to the database for series {SeriesName}",
series.Name);
await _eventHub.SendMessageAsync(MessageFactory.Error,
MessageFactory.ErrorEvent($"There was an issue writing to the DB for Series {series.OriginalName}",
ex.Message));
return;
}
catch (Exception ex)
{
await _unitOfWork.RollbackAsync();