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

Stop all reads/writes to the admin_log_entity table (#21186)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-22 21:24:03 -07:00
committed by GitHub
parent 43d5c00648
commit 52e1d64ee2
3 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/Administration/Logs/AdminLogManager.Json.cs
View File

@@ -2,7 +2,6 @@
using System.Text.Json;
using System.Text.Json.Serialization;
using Content.Server.Administration.Logs.Converters;
using Content.Server.Database;
using Robust.Server.GameObjects;
using Robust.Server.Player;
using Robust.Shared.Map;
@@ -34,10 +33,9 @@ public sealed partial class AdminLogManager
_sawmill.Debug($"Admin log converters found: {string.Join(" ", converterNames)}");
}
private (JsonDocument Json, HashSet<Guid> Players, List<AdminLogEntity> Entities) ToJson(
private (JsonDocument Json, HashSet<Guid> Players) ToJson(
Dictionary<string, object?> properties)
{
var entities = new Dictionary<EntityUid, AdminLogEntity>();
var players = new HashSet<Guid>();
var parsed = new Dictionary<string, object?>();
@@ -63,24 +61,12 @@ public sealed partial class AdminLogManager
_ => null
};
if (entityId is not { } uid)
{
continue;
}
var entityName = _entityManager.TryGetComponent(uid, out MetaDataComponent? metadata)
? metadata.EntityName
: null;
// TODO set the id too whenever we feel like running a migration for 10 hours
entities.TryAdd(uid, new AdminLogEntity { Name = entityName });
if (_entityManager.TryGetComponent(uid, out ActorComponent? actor))
if (_entityManager.TryGetComponent(entityId, out ActorComponent? actor))
{
players.Add(actor.PlayerSession.UserId.UserId);
}
}
return (JsonSerializer.SerializeToDocument(parsed, _jsonOptions), players, entities.Values.ToList());
return (JsonSerializer.SerializeToDocument(parsed, _jsonOptions), players);
}
}