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

2
Content.Server.Database/Model.cs
View File

@@ -517,6 +517,7 @@ namespace Content.Server.Database
public List<AdminLogPlayer> Players { get; set; } = default!; public List<AdminLogPlayer> Players { get; set; } = default!;
// Unused
public List<AdminLogEntity> Entities { get; set; } = default!; public List<AdminLogEntity> Entities { get; set; } = default!;
} }
@@ -530,6 +531,7 @@ namespace Content.Server.Database
[ForeignKey("LogId,RoundId")] public AdminLog Log { get; set; } = default!; [ForeignKey("LogId,RoundId")] public AdminLog Log { get; set; } = default!;
} }
// Unused
public class AdminLogEntity public class AdminLogEntity
{ {
[Required, Key] public int Uid { get; set; } [Required, Key] public int Uid { get; set; }

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

@@ -2,7 +2,6 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Content.Server.Administration.Logs.Converters; using Content.Server.Administration.Logs.Converters;
using Content.Server.Database;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -34,10 +33,9 @@ public sealed partial class AdminLogManager
_sawmill.Debug($"Admin log converters found: {string.Join(" ", converterNames)}"); _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) Dictionary<string, object?> properties)
{ {
var entities = new Dictionary<EntityUid, AdminLogEntity>();
var players = new HashSet<Guid>(); var players = new HashSet<Guid>();
var parsed = new Dictionary<string, object?>(); var parsed = new Dictionary<string, object?>();
@@ -63,24 +61,12 @@ public sealed partial class AdminLogManager
_ => null _ => null
}; };
if (entityId is not { } uid) if (_entityManager.TryGetComponent(entityId, out ActorComponent? actor))
{
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))
{ {
players.Add(actor.PlayerSession.UserId.UserId); players.Add(actor.PlayerSession.UserId.UserId);
} }
} }
return (JsonSerializer.SerializeToDocument(parsed, _jsonOptions), players, entities.Values.ToList()); return (JsonSerializer.SerializeToDocument(parsed, _jsonOptions), players);
} }
} }

9
Content.Server/Administration/Logs/AdminLogManager.cs
View File

@@ -278,7 +278,7 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
} }
} }
private void Add(LogType type, LogImpact impact, string message, JsonDocument json, HashSet<Guid> players, List<AdminLogEntity> entities) private void Add(LogType type, LogImpact impact, string message, JsonDocument json, HashSet<Guid> players)
{ {
var preRound = _runLevel == GameRunLevel.PreRoundLobby; var preRound = _runLevel == GameRunLevel.PreRoundLobby;
var count = preRound ? _preRoundLogQueue.Count : _logQueue.Count; var count = preRound ? _preRoundLogQueue.Count : _logQueue.Count;
@@ -297,8 +297,7 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
Date = DateTime.UtcNow, Date = DateTime.UtcNow,
Message = message, Message = message,
Json = json, Json = json,
Players = new List<AdminLogPlayer>(players.Count), Players = new List<AdminLogPlayer>(players.Count)
Entities = entities
}; };
foreach (var id in players) foreach (var id in players)
@@ -331,10 +330,10 @@ public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogMa
return; return;
} }
var (json, players, entities) = ToJson(handler.Values); var (json, players) = ToJson(handler.Values);
var message = handler.ToStringAndClear(); var message = handler.ToStringAndClear();
Add(type, impact, message, json, players, entities); Add(type, impact, message, json, players);
} }
public override void Add(LogType type, ref LogStringHandler handler) public override void Add(LogType type, ref LogStringHandler handler)