alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-05 07:18:47 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into quickconnect

Browse Source
This commit is contained in:
Matt Montgomery
2020-07-26 16:14:58 -05:00
parent e2f16fc255 8ab800508b
commit a40fe86776
419 changed files with 4830 additions and 2636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Session
}
catch (DbUpdateConcurrencyException e)
{
_logger.LogWarning(e, "Error updating user's last activity date.");
_logger.LogDebug(e, "Error updating user's last activity date.");
}
}
}
@@ -502,7 +502,8 @@ namespace Emby.Server.Implementations.Session
Client = appName,
DeviceId = deviceId,
ApplicationVersion = appVersion,
Id = key.GetMD5().ToString("N", CultureInfo.InvariantCulture)
Id = key.GetMD5().ToString("N", CultureInfo.InvariantCulture),
ServerId = _appHost.SystemId
};
var username = user?.Username;