diff options
| author | Bond-009 <bond.009@outlook.com> | 2026-05-14 07:47:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-14 07:47:21 +0200 |
| commit | a8ab398fabf46f3a8921fedaf6ac56dd52ecdeb5 (patch) | |
| tree | d80866a2509eccef143a6bc0a29b265625a15204 | |
| parent | 157431475f689caf5772c5d3e598eda75c7f2bff (diff) | |
| parent | a47da0f1a3c68ed2a418416f24e3d7b0ed704ed0 (diff) | |
Merge pull request #16835 from JPVenson/fix/adaptLoggingForUserConcurrency
Update log for user session related concurrency update fails
| -rw-r--r-- | Emby.Server.Implementations/Session/SessionManager.cs | 4 | ||||
| -rw-r--r-- | src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 1782b53e10..2885b89e3a 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -271,9 +271,9 @@ namespace Emby.Server.Implementations.Session user.LastActivityDate = activityDate; await _userManager.UpdateUserAsync(user).ConfigureAwait(false); } - catch (DbUpdateConcurrencyException e) + catch (DbUpdateConcurrencyException) { - _logger.LogDebug(e, "Error updating user's last activity date."); + _logger.LogDebug("Error updating user's last activity date due to concurrency conflict. This is an expected event."); } } } diff --git a/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs b/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs index f6fce7279a..83c15aa647 100644 --- a/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs +++ b/src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs @@ -273,6 +273,11 @@ public class JellyfinDbContext(DbContextOptions<JellyfinDbContext> options, ILog }).ConfigureAwait(false); return result; } + catch (DbUpdateConcurrencyException) + { + // a concurrency exception is supposed to be always handled by the invoker of the method, logging it here is only causing log bloat. + throw; + } catch (Exception e) { logger.LogError(e, "Error trying to save changes."); |