alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-15 21:26:45 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

backport changes from #16835

Browse Source
This commit is contained in:
JPVenson
2026-05-14 12:54:35 +00:00
parent 938c043596
commit f7d80ae9e6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/Session/SessionManager.cs
View File

@@ -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.");
}
}
}

10
src/Jellyfin.Database/Jellyfin.Database.Implementations/JellyfinDbContext.cs
View File

@@ -268,6 +268,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.");
@@ -289,6 +294,11 @@ public class JellyfinDbContext(DbContextOptions<JellyfinDbContext> options, ILog
});
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.");