From b1e3b792537d9cbe9b5ee9acff9273696998c8bf Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Sat, 4 May 2024 16:54:48 -0700
Subject: [PATCH] Mirror: Obsolete `Logger` cleanup for `EntitySystem`s (#132)
## Mirror of PR #25941: [Obsolete `Logger` cleanup for
`EntitySystem`s](https://github.com/space-wizards/space-station-14/pull/25941)
from
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)
###### `aafe81512258b5a80776ada1f471b58e7507ca2d`
PR opened by LordCarve at
2024-03-09 12:19:14 UTC
PR merged by web-flow at
2024-03-10 00:15:13 UTC
---
PR changed 25 files with 41 additions and 45 deletions.
The PR had the following labels:
- Status: Needs Review
---
Original Body
>
>
>
> ## About the PR
>
> Changed almost all[^1] obsolete `Logger` calls in Content's
`EntitySystem`s to use `Log` instead. `Log` automatically selects the
system-specific `Sawmill`, so this isn't just a refactor - it makes logs
slightly more accurate (puts them in appropriate sawmill/context rather
than the root sawmill).
>
> ## Why / Balance
>
> Using `Logger` directly for logging is marked obsolete. Assumed this
is a desired change.
>
> ## Technical details
>
> This changes some log contexts, but generally in a desirable way:
> - For most, it put logs in `system.appropriate` `Sawmill` rather than
root.
> - For some that were forced into another `Sawmill` it changes it to a
more specific one, i.e. from `atmos` it becomes `system.gas_filter` or
`system.automatic_atmos` and `system.station` into
`system.station_jobs`.
> - For the rest it remains unchanged
>
> **I assumed that all of the above was desirable because this seems to
be the standard convention** - I imagine that was the idea behind the
`Log` in all `EntitySystem`s coupled with `[Obsolete] Logger` methods -
**but if my assumptions are incorrect and/or there are exceptions,
please let me know and I will adjust.**
>
> [^1]: There is only one `EntitySystem` that I didn't update -
`ExamineSystemShared`. That is because the `Logger` is in a `static`
method and refactoring that away causes a lot of cascading changes. May
do it as a separate PR to avoid overly diluting this one.
>
> ## Media
>
>
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
>
> Log output changes. `EntitySystem` logs now go to the expected
`Sawmill` for the system rather than hardcoded/root one.
> Any log analyzers anticipating these logs' context must be updated.
Co-authored-by: LordCarve <27449516+LordCarve@users.noreply.github.com>
---
Content.Client/Alerts/ClientAlertsSystem.cs | 2 +-
.../Clothing/ClientClothingSystem.cs | 2 +-
.../IconSmoothing/IconSmoothSystem.cs | 4 ++--
Content.Client/Info/InfoSystem.cs | 4 ++--
.../Light/RgbLightControllerSystem.cs | 2 +-
Content.Client/Sprite/RandomSpriteSystem.cs | 2 +-
.../EntitySystems/AutomaticAtmosSystem.cs | 2 +-
.../Trinary/EntitySystems/GasFilterSystem.cs | 2 +-
.../ExplosionSystem.Processing.cs | 2 +-
.../EntitySystems/ExplosionSystem.TileFill.cs | 2 +-
.../EntitySystems/ExplosionSystem.cs | 2 +-
.../EntitySystems/SmokeOnTriggerSystem.cs | 2 +-
.../Systems/HumanoidAppearanceSystem.cs | 2 +-
Content.Server/Info/InfoSystem.cs | 4 ++--
.../ParticleAcceleratorSystem.Emitter.cs | 2 +-
.../EntitySystems/ConditionalSpawnerSystem.cs | 4 ++--
.../Systems/StationJobsSystem.Roundstart.cs | 3 +--
.../Station/Systems/StationSystem.cs | 2 +-
.../Store/Systems/StoreSystem.Listings.cs | 2 +-
Content.Server/Strip/StrippableSystem.cs | 4 ++--
Content.Server/Traits/TraitSystem.cs | 2 +-
.../Systems/Biomes/BiomeSelectionSystem.cs | 4 ++--
.../Worldgen/Systems/WorldgenConfigSystem.cs | 4 ++--
Content.Shared/DoAfter/SharedDoAfterSystem.cs | 2 +-
.../Interaction/SharedInteractionSystem.cs | 23 ++++++++-----------
25 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index ab296a96195..237f24e3eae 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -33,7 +33,7 @@ protected override void LoadPrototypes()
AlertOrder = _prototypeManager.EnumeratePrototypes().FirstOrDefault();
if (AlertOrder == null)
- Log.Error("alert", "no alertOrder prototype found, alerts will be in random order");
+ Log.Error("No alertOrder prototype found, alerts will be in random order");
}
public IReadOnlyDictionary? ActiveAlerts
diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs
index 925e3abf8cb..fbe9d5ec5bb 100644
--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -271,7 +271,7 @@ private void RenderEquipment(EntityUid equipee, EntityUid equipment, string slot
{
if (!revealedLayers.Add(key))
{
- Logger.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}");
+ Log.Warning($"Duplicate key for clothing visuals: {key}. Are multiple components attempting to modify the same layer? Equipment: {ToPrettyString(equipment)}");
continue;
}
diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index 7334c2fd432..0ab33c65202 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -231,7 +231,7 @@ private void CalculateNewSprite(EntityUid uid,
if (!spriteQuery.TryGetComponent(uid, out var sprite))
{
- Logger.Error($"Encountered a icon-smoothing entity without a sprite: {ToPrettyString(uid)}");
+ Log.Error($"Encountered a icon-smoothing entity without a sprite: {ToPrettyString(uid)}");
RemCompDeferred(uid, smooth);
return;
}
@@ -242,7 +242,7 @@ private void CalculateNewSprite(EntityUid uid,
{
if (!_mapManager.TryGetGrid(xform.GridUid, out grid))
{
- Logger.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing.");
+ Log.Error($"Failed to calculate IconSmoothComponent sprite in {uid} because grid {xform.GridUid} was missing.");
return;
}
}
diff --git a/Content.Client/Info/InfoSystem.cs b/Content.Client/Info/InfoSystem.cs
index 4572f3afdca..b6979949818 100644
--- a/Content.Client/Info/InfoSystem.cs
+++ b/Content.Client/Info/InfoSystem.cs
@@ -12,13 +12,13 @@ public override void Initialize()
{
base.Initialize();
SubscribeNetworkEvent(OnRulesReceived);
- Logger.DebugS("info", "Requested server info.");
+ Log.Debug("Requested server info.");
RaiseNetworkEvent(new RequestRulesMessage());
}
private void OnRulesReceived(RulesMessage message, EntitySessionEventArgs eventArgs)
{
- Logger.DebugS("info", "Received server rules.");
+ Log.Debug("Received server rules.");
Rules = message;
_rules.UpdateRules();
}
diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs
index ad8ca475828..7d55bcebf11 100644
--- a/Content.Client/Light/RgbLightControllerSystem.cs
+++ b/Content.Client/Light/RgbLightControllerSystem.cs
@@ -146,7 +146,7 @@ private void GetOriginalColors(EntityUid uid, RgbLightControllerComponent? rgb =
else
{
// admeme fuck-ups or bad yaml?
- Logger.Warning($"RGB light attempted to use invalid sprite index {index} on entity {ToPrettyString(uid)}");
+ Log.Warning($"RGB light attempted to use invalid sprite index {index} on entity {ToPrettyString(uid)}");
rgb.Layers.Remove(index);
}
}
diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs
index 0e6f199b8a2..b9be2a44b42 100644
--- a/Content.Client/Sprite/RandomSpriteSystem.cs
+++ b/Content.Client/Sprite/RandomSpriteSystem.cs
@@ -73,7 +73,7 @@ private void UpdateSpriteComponentAppearance(EntityUid uid, RandomSpriteComponen
{
if (layer.Key is not { } strKey || !int.TryParse(strKey, out index))
{
- Logger.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}");
+ Log.Error($"Invalid key `{layer.Key}` for entity with random sprite {ToPrettyString(uid)}");
continue;
}
}
diff --git a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
index 5d60ae57d9b..203c747e29e 100644
--- a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
@@ -39,7 +39,7 @@ private void OnTileChanged(ref TileChangedEvent ev)
if (physics.Mass / ShuttleSystem.TileMassMultiplier >= 7.0f)
{
AddComp(ev.Entity);
- Logger.InfoS("atmos", $"Giving grid {ev.Entity} GridAtmosphereComponent.");
+ Log.Info($"Giving grid {ev.Entity} GridAtmosphereComponent.");
}
// It's not super important to remove it should the grid become too small again.
// If explosions ever gain the ability to outright shatter grids, do rethink this.
diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
index f38e0299a0d..faf06a60793 100644
--- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
+++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
@@ -167,7 +167,7 @@ private void OnSelectGasMessage(EntityUid uid, GasFilterComponent filter, GasFil
}
else
{
- Logger.Warning("atmos", $"{ToPrettyString(uid)} received GasFilterSelectGasMessage with an invalid ID: {args.ID}");
+ Log.Warning($"{ToPrettyString(uid)} received GasFilterSelectGasMessage with an invalid ID: {args.ID}");
}
}
else
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
index 2bfc753b74a..31451c425f5 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -156,7 +156,7 @@ public override void Update(float frameTime)
#endif
}
- Logger.InfoS("Explosion", $"Processed {TilesPerTick - tilesRemaining} tiles in {Stopwatch.Elapsed.TotalMilliseconds}ms");
+ Log.Info($"Processed {TilesPerTick - tilesRemaining} tiles in {Stopwatch.Elapsed.TotalMilliseconds}ms");
// we have finished processing our tiles. Is there still an ongoing explosion?
if (_activeExplosion != null)
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
index 1b324d924bc..afad0e27e09 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
@@ -37,7 +37,7 @@ public sealed partial class ExplosionSystem : EntitySystem
if (!_explosionTypes.TryGetValue(typeID, out var typeIndex))
{
- Logger.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported.");
+ Log.Error("Attempted to spawn explosion using a prototype that was not defined during initialization. Explosion prototype hot-reload is not currently supported.");
return null;
}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 7495ecbb349..1a5a5c40118 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -290,7 +290,7 @@ public void QueueExplosion(MapCoordinates epicenter,
if (!_prototypeManager.TryIndex(typeId, out var type))
{
- Logger.Error($"Attempted to spawn unknown explosion prototype: {type}");
+ Log.Error($"Attempted to spawn unknown explosion prototype: {type}");
return;
}
diff --git a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
index c0775947ba4..17ca9723569 100644
--- a/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
@@ -37,7 +37,7 @@ private void OnTrigger(EntityUid uid, SmokeOnTriggerComponent comp, TriggerEvent
var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
if (!TryComp(ent, out var smoke))
{
- Logger.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
+ Log.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
Del(ent);
return;
}
diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
index 770e9fc39b3..a0e9143eda9 100644
--- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
+++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
@@ -188,7 +188,7 @@ public string GetAgeRepresentation(string species, int age)
if (speciesPrototype == null)
{
- Logger.Error("Tried to get age representation of species that couldn't be indexed: " + species);
+ Log.Error("Tried to get age representation of species that couldn't be indexed: " + species);
return Loc.GetString("identity-age-young");
}
diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs
index 04fa6a57e59..350ae033cfd 100644
--- a/Content.Server/Info/InfoSystem.cs
+++ b/Content.Server/Info/InfoSystem.cs
@@ -17,7 +17,7 @@ public override void Initialize()
private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs)
{
- Log.Debug("info", "Client requested rules.");
+ Log.Debug("Client requested rules.");
var title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader));
var path = _cfg.GetCVar(CCVars.RulesFile);
var rules = "Server could not read its rules.";
@@ -27,7 +27,7 @@ private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs
}
catch (Exception)
{
- Log.Debug("info", "Could not read server rules file.");
+ Log.Debug("Could not read server rules file.");
}
var response = new RulesMessage(title, rules);
RaiseNetworkEvent(response, eventArgs.SenderSession.Channel);
diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
index 7fad69e349f..46b25163cc0 100644
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
@@ -16,7 +16,7 @@ private void FireEmitter(EntityUid uid, ParticleAcceleratorPowerState strength,
var xformQuery = GetEntityQuery();
if (!xformQuery.TryGetComponent(uid, out var xform))
{
- Logger.Error("ParticleAccelerator attempted to emit a particle without (having) a transform from which to base its initial position and orientation.");
+ Log.Error("ParticleAccelerator attempted to emit a particle without (having) a transform from which to base its initial position and orientation.");
return;
}
diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
index 66167465068..506fd61d559 100644
--- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
+++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
@@ -73,7 +73,7 @@ private void Spawn(EntityUid uid, ConditionalSpawnerComponent component)
if (component.Prototypes.Count == 0)
{
- Logger.Warning($"Prototype list in ConditionalSpawnComponent is empty! Entity: {ToPrettyString(uid)}");
+ Log.Warning($"Prototype list in ConditionalSpawnComponent is empty! Entity: {ToPrettyString(uid)}");
return;
}
@@ -94,7 +94,7 @@ private void Spawn(EntityUid uid, RandomSpawnerComponent component)
if (component.Prototypes.Count == 0)
{
- Logger.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {ToPrettyString(uid)}");
+ Log.Warning($"Prototype list in RandomSpawnerComponent is empty! Entity: {ToPrettyString(uid)}");
return;
}
diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
index 78d1b1e2125..4b7cd64961b 100644
--- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
@@ -323,8 +323,7 @@ public void CalcExtendedAccess(Dictionary jobsCount)
jobs.ExtendedAccess = count <= thresh;
- Logger.DebugS(
- "station", "Station {Station} on extended access: {ExtendedAccess}",
+ Log.Debug("Station {Station} on extended access: {ExtendedAccess}",
Name(station), jobs.ExtendedAccess);
}
}
diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs
index 4647392665b..b9ff8a4339d 100644
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -456,7 +456,7 @@ public void DeleteStation(EntityUid station, StationDataComponent? stationData =
if (xform.GridUid == EntityUid.Invalid)
{
- Log.Debug("A");
+ Log.Debug("Unable to get owning station - GridUid invalid.");
return null;
}
diff --git a/Content.Server/Store/Systems/StoreSystem.Listings.cs b/Content.Server/Store/Systems/StoreSystem.Listings.cs
index b5d1ae79be1..a56d9640d37 100644
--- a/Content.Server/Store/Systems/StoreSystem.Listings.cs
+++ b/Content.Server/Store/Systems/StoreSystem.Listings.cs
@@ -43,7 +43,7 @@ public bool TryAddListing(StoreComponent component, string listingId)
{
if (!_proto.TryIndex(listingId, out var proto))
{
- Logger.Error("Attempted to add invalid listing.");
+ Log.Error("Attempted to add invalid listing.");
return false;
}
return TryAddListing(component, proto);
diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs
index 50a9cb9b691..96b2ecc00c6 100644
--- a/Content.Server/Strip/StrippableSystem.cs
+++ b/Content.Server/Strip/StrippableSystem.cs
@@ -210,7 +210,7 @@ bool Check()
if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
{
- Logger.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
+ Log.Error($"{ToPrettyString(user)} attempted to place an item in a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
return;
}
@@ -347,7 +347,7 @@ bool Check()
if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef))
{
- Logger.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
+ Log.Error($"{ToPrettyString(user)} attempted to take an item from a non-existent inventory slot ({slot}) on {ToPrettyString(target)}");
return;
}
diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs
index 91b0d6caea8..22ee0e4861f 100644
--- a/Content.Server/Traits/TraitSystem.cs
+++ b/Content.Server/Traits/TraitSystem.cs
@@ -27,7 +27,7 @@ private void OnPlayerSpawnComplete(PlayerSpawnCompleteEvent args)
{
if (!_prototypeManager.TryIndex(traitId, out var traitPrototype))
{
- Logger.Warning($"No trait found with ID {traitId}!");
+ Log.Warning($"No trait found with ID {traitId}!");
return;
}
diff --git a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
index 3fff584217b..1827f6deeda 100644
--- a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
+++ b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
using Content.Server.Worldgen.Components;
using Content.Server.Worldgen.Prototypes;
using Robust.Shared.Prototypes;
@@ -35,7 +35,7 @@ private void OnWorldChunkAdded(EntityUid uid, BiomeSelectionComponent component,
return;
}
- Logger.Error($"Biome selection ran out of biomes to select? See biomes list: {component.Biomes}");
+ Log.Error($"Biome selection ran out of biomes to select? See biomes list: {component.Biomes}");
}
private void OnBiomeSelectionStartup(EntityUid uid, BiomeSelectionComponent component, ComponentStartup args)
diff --git a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
index d3eeeb6037a..c47bfb9f887 100644
--- a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
+++ b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Administration;
+using Content.Server.Administration;
using Content.Server.GameTicking;
using Content.Server.GameTicking.Events;
using Content.Server.Worldgen.Components;
@@ -74,7 +74,7 @@ private void OnLoadingMaps(RoundStartingEvent ev)
return;
var target = _map.GetMapEntityId(_gameTicker.DefaultMap);
- Logger.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}");
+ Log.Debug($"Trying to configure {_gameTicker.DefaultMap}, aka {ToPrettyString(target)} aka {target}");
var cfg = _proto.Index(_worldgenConfig);
cfg.Apply(target, _ser, EntityManager); // Apply the config to the map.
diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index 382ecb5a9a5..9e81c91550f 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -157,7 +157,7 @@ public async Task WaitDoAfter(DoAfterArgs doAfter, DoAfterCompone
if (doAfter.Delay <= TimeSpan.Zero)
{
- Logger.Warning("Awaited instant DoAfters are not supported fully supported");
+ Log.Warning("Awaited instant DoAfters are not supported fully supported");
return DoAfterStatus.Finished;
}
diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
index 75063c55503..7d5e390b6f0 100644
--- a/Content.Shared/Interaction/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -171,7 +171,7 @@ private bool HandleTryPullObject(ICommonSession? session, EntityCoordinates coor
{
if (!ValidateClientInput(session, coords, uid, out var userEntity))
{
- Logger.InfoS("system.interaction", $"TryPullObject input validation failed");
+ Log.Info($"TryPullObject input validation failed");
return true;
}
@@ -203,7 +203,7 @@ private void HandleInteractInventorySlotEvent(InteractInventorySlotEvent msg, En
// client sanitization
if (!TryComp(item, out TransformComponent? itemXform) || !ValidateClientInput(args.SenderSession, itemXform.Coordinates, item, out var user))
{
- Logger.InfoS("system.interaction", $"Inventory interaction validation failed. Session={args.SenderSession}");
+ Log.Info($"Inventory interaction validation failed. Session={args.SenderSession}");
return;
}
@@ -225,7 +225,7 @@ public bool HandleAltUseInteraction(ICommonSession? session, EntityCoordinates c
// client sanitization
if (!ValidateClientInput(session, coords, uid, out var user))
{
- Logger.InfoS("system.interaction", $"Alt-use input validation failed");
+ Log.Info($"Alt-use input validation failed");
return true;
}
@@ -239,7 +239,7 @@ public bool HandleUseInteraction(ICommonSession? session, EntityCoordinates coor
// client sanitization
if (!ValidateClientInput(session, coords, uid, out var userEntity))
{
- Logger.InfoS("system.interaction", $"Use input validation failed");
+ Log.Info($"Use input validation failed");
return true;
}
@@ -547,7 +547,7 @@ public bool InRangeUnobstructed(
if (length > MaxRaycastRange)
{
- Logger.Warning("InRangeUnobstructed check performed over extreme range. Limiting CollisionRay size.");
+ Log.Warning("InRangeUnobstructed check performed over extreme range. Limiting CollisionRay size.");
length = MaxRaycastRange;
}
@@ -921,7 +921,7 @@ private bool HandleActivateItemInWorld(ICommonSession? session, EntityCoordinate
{
if (!ValidateClientInput(session, coords, uid, out var user))
{
- Logger.InfoS("system.interaction", $"ActivateItemInWorld input validation failed");
+ Log.Info($"ActivateItemInWorld input validation failed");
return false;
}
@@ -1100,14 +1100,13 @@ protected bool ValidateClientInput(ICommonSession? session, EntityCoordinates co
if (!coords.IsValid(EntityManager))
{
- Logger.InfoS("system.interaction", $"Invalid Coordinates: client={session}, coords={coords}");
+ Log.Info($"Invalid Coordinates: client={session}, coords={coords}");
return false;
}
if (IsClientSide(uid))
{
- Logger.WarningS("system.interaction",
- $"Client sent interaction with client-side entity. Session={session}, Uid={uid}");
+ Log.Warning($"Client sent interaction with client-side entity. Session={session}, Uid={uid}");
return false;
}
@@ -1115,15 +1114,13 @@ protected bool ValidateClientInput(ICommonSession? session, EntityCoordinates co
if (userEntity == null || !userEntity.Value.Valid)
{
- Logger.WarningS("system.interaction",
- $"Client sent interaction with no attached entity. Session={session}");
+ Log.Warning($"Client sent interaction with no attached entity. Session={session}");
return false;
}
if (!Exists(userEntity))
{
- Logger.WarningS("system.interaction",
- $"Client attempted interaction with a non-existent attached entity. Session={session}, entity={userEntity}");
+ Log.Warning($"Client attempted interaction with a non-existent attached entity. Session={session}, entity={userEntity}");
return false;
}