tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix S.T.Json holding integration instances live for long. (#13080)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-12-19 03:09:50 +01:00
committed by GitHub
parent 4bfc644a03
commit 896ffec8d9
6 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Administration/Logs/Converters/PlayerSessionConverter.cs
View File

@@ -6,13 +6,23 @@ namespace Content.Server.Administration.Logs.Converters;
[AdminLogConverter]
public sealed class PlayerSessionConverter : AdminLogConverter<SerializablePlayer>
{
// System.Text.Json actually keeps hold of your JsonSerializerOption instances in a cache on .NET 7.
// Use a weak reference to avoid holding server instances live too long in integration tests.
private WeakReference<IEntityManager> _entityManager = default!;
public override void Init(IDependencyCollection dependencies)
{
_entityManager = new WeakReference<IEntityManager>(dependencies.Resolve<IEntityManager>());
}
public override void Write(Utf8JsonWriter writer, SerializablePlayer value, JsonSerializerOptions options)
{
writer.WriteStartObject();
if (value.Player.AttachedEntity is {Valid: true} playerEntity)
{
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!_entityManager.TryGetTarget(out var entityManager))
throw new InvalidOperationException("EntityManager got garbage collected!");
writer.WriteNumber("id", (int) value.Player.AttachedEntity);
writer.WriteString("name", entityManager.GetComponent<MetaDataComponent>(playerEntity).EntityName);