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

Obsolete Logger cleanup for EntitySystems (#25941)

Browse Source 
* Small obsolete Logger cleanup

* Fixed three EntitySystem logs that weren't doing it right.
This commit is contained in:
LordCarve
2024-03-10 01:15:13 +01:00
committed by GitHub
parent 865765d4ec
commit aafe815122
25 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Alerts/ClientAlertsSystem.cs
View File

@@ -33,7 +33,7 @@ public sealed class ClientAlertsSystem : AlertsSystem
AlertOrder = _prototypeManager.EnumeratePrototypes<AlertOrderPrototype>().FirstOrDefault(); AlertOrder = _prototypeManager.EnumeratePrototypes<AlertOrderPrototype>().FirstOrDefault();
if (AlertOrder == null) 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<AlertKey, AlertState>? ActiveAlerts public IReadOnlyDictionary<AlertKey, AlertState>? ActiveAlerts

2
Content.Client/Clothing/ClientClothingSystem.cs
View File

@@ -271,7 +271,7 @@ public sealed class ClientClothingSystem : ClothingSystem
{ {
if (!revealedLayers.Add(key)) 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; continue;
} }

4
Content.Client/IconSmoothing/IconSmoothSystem.cs
View File

@@ -231,7 +231,7 @@ namespace Content.Client.IconSmoothing
if (!spriteQuery.TryGetComponent(uid, out var sprite)) 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); RemCompDeferred(uid, smooth);
return; return;
} }
@@ -242,7 +242,7 @@ namespace Content.Client.IconSmoothing
{ {
if (!_mapManager.TryGetGrid(xform.GridUid, out grid)) 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; return;
} }
} }

4
Content.Client/Info/InfoSystem.cs
View File

@@ -12,13 +12,13 @@ public sealed class InfoSystem : EntitySystem
{ {
base.Initialize(); base.Initialize();
SubscribeNetworkEvent<RulesMessage>(OnRulesReceived); SubscribeNetworkEvent<RulesMessage>(OnRulesReceived);
Logger.DebugS("info", "Requested server info."); Log.Debug("Requested server info.");
RaiseNetworkEvent(new RequestRulesMessage()); RaiseNetworkEvent(new RequestRulesMessage());
} }
private void OnRulesReceived(RulesMessage message, EntitySessionEventArgs eventArgs) private void OnRulesReceived(RulesMessage message, EntitySessionEventArgs eventArgs)
{ {
Logger.DebugS("info", "Received server rules."); Log.Debug("Received server rules.");
Rules = message; Rules = message;
_rules.UpdateRules(); _rules.UpdateRules();
} }

2
Content.Client/Light/RgbLightControllerSystem.cs
View File

@@ -146,7 +146,7 @@ namespace Content.Client.Light
else else
{ {
// admeme fuck-ups or bad yaml? // 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); rgb.Layers.Remove(index);
} }
} }

2
Content.Client/Sprite/RandomSpriteSystem.cs
View File

@@ -51,7 +51,7 @@ public sealed class RandomSpriteSystem : SharedRandomSpriteSystem
{ {
if (layer.Key is not { } strKey || !int.TryParse(strKey, out index)) 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; continue;
} }
} }

2
Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
View File

@@ -39,7 +39,7 @@ public sealed class AutomaticAtmosSystem : EntitySystem
if (physics.Mass / ShuttleSystem.TileMassMultiplier >= 7.0f) if (physics.Mass / ShuttleSystem.TileMassMultiplier >= 7.0f)
{ {
AddComp<GridAtmosphereComponent>(ev.Entity); AddComp<GridAtmosphereComponent>(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. // 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. // If explosions ever gain the ability to outright shatter grids, do rethink this.

2
Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
View File

@@ -167,7 +167,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
} }
else 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 else

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
View File

@@ -156,7 +156,7 @@ public sealed partial class ExplosionSystem
#endif #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? // we have finished processing our tiles. Is there still an ongoing explosion?
if (_activeExplosion != null) if (_activeExplosion != null)

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs
View File

@@ -37,7 +37,7 @@ public sealed partial class ExplosionSystem : EntitySystem
if (!_explosionTypes.TryGetValue(typeID, out var typeIndex)) 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; return null;
} }

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
View File

@@ -290,7 +290,7 @@ public sealed partial class ExplosionSystem : EntitySystem
if (!_prototypeManager.TryIndex<ExplosionPrototype>(typeId, out var type)) if (!_prototypeManager.TryIndex<ExplosionPrototype>(typeId, out var type))
{ {
Logger.Error($"Attempted to spawn unknown explosion prototype: {type}"); Log.Error($"Attempted to spawn unknown explosion prototype: {type}");
return; return;
} }

2
Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs
View File

@@ -37,7 +37,7 @@ public sealed class SmokeOnTriggerSystem : SharedSmokeOnTriggerSystem
var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid()); var ent = Spawn(comp.SmokePrototype, coords.SnapToGrid());
if (!TryComp<SmokeComponent>(ent, out var smoke)) if (!TryComp<SmokeComponent>(ent, out var smoke))
{ {
Logger.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent"); Log.Error($"Smoke prototype {comp.SmokePrototype} was missing SmokeComponent");
Del(ent); Del(ent);
return; return;
} }

2
Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
View File

@@ -186,7 +186,7 @@ public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceS
if (speciesPrototype == null) 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"); return Loc.GetString("identity-age-young");
} }

4
Content.Server/Info/InfoSystem.cs
View File

@@ -17,7 +17,7 @@ public sealed class InfoSystem : EntitySystem
private void OnRequestRules(RequestRulesMessage message, EntitySessionEventArgs eventArgs) 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 title = Loc.GetString(_cfg.GetCVar(CCVars.RulesHeader));
var path = _cfg.GetCVar(CCVars.RulesFile); var path = _cfg.GetCVar(CCVars.RulesFile);
var rules = "Server could not read its rules."; var rules = "Server could not read its rules.";
@@ -27,7 +27,7 @@ public sealed class InfoSystem : EntitySystem
} }
catch (Exception) 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); var response = new RulesMessage(title, rules);
RaiseNetworkEvent(response, eventArgs.SenderSession.Channel); RaiseNetworkEvent(response, eventArgs.SenderSession.Channel);

2
Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.Emitter.cs
View File

@@ -16,7 +16,7 @@ public sealed partial class ParticleAcceleratorSystem
var xformQuery = GetEntityQuery<TransformComponent>(); var xformQuery = GetEntityQuery<TransformComponent>();
if (!xformQuery.TryGetComponent(uid, out var xform)) 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; return;
} }

4
Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs
View File

@@ -73,7 +73,7 @@ namespace Content.Server.Spawners.EntitySystems
if (component.Prototypes.Count == 0) 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; return;
} }
@@ -94,7 +94,7 @@ namespace Content.Server.Spawners.EntitySystems
if (component.Prototypes.Count == 0) 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; return;
} }

3
Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
View File

@@ -323,8 +323,7 @@ public sealed partial class StationJobsSystem
jobs.ExtendedAccess = count <= thresh; jobs.ExtendedAccess = count <= thresh;
Logger.DebugS( Log.Debug("Station {Station} on extended access: {ExtendedAccess}",
"station", "Station {Station} on extended access: {ExtendedAccess}",
Name(station), jobs.ExtendedAccess); Name(station), jobs.ExtendedAccess);
} }
} }

2
Content.Server/Station/Systems/StationSystem.cs
View File

@@ -456,7 +456,7 @@ public sealed class StationSystem : EntitySystem
if (xform.GridUid == EntityUid.Invalid) if (xform.GridUid == EntityUid.Invalid)
{ {
Log.Debug("A"); Log.Debug("Unable to get owning station - GridUid invalid.");
return null; return null;
} }

2
Content.Server/Store/Systems/StoreSystem.Listings.cs
View File

@@ -43,7 +43,7 @@ public sealed partial class StoreSystem
{ {
if (!_proto.TryIndex<ListingPrototype>(listingId, out var proto)) if (!_proto.TryIndex<ListingPrototype>(listingId, out var proto))
{ {
Logger.Error("Attempted to add invalid listing."); Log.Error("Attempted to add invalid listing.");
return false; return false;
} }
return TryAddListing(component, proto); return TryAddListing(component, proto);

4
Content.Server/Strip/StrippableSystem.cs
View File

@@ -210,7 +210,7 @@ namespace Content.Server.Strip
if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef)) 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; return;
} }
@@ -347,7 +347,7 @@ namespace Content.Server.Strip
if (!_inventorySystem.TryGetSlot(target, slot, out var slotDef)) 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; return;
} }

2
Content.Server/Traits/TraitSystem.cs
View File

@@ -27,7 +27,7 @@ public sealed class TraitSystem : EntitySystem
{ {
if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype)) if (!_prototypeManager.TryIndex<TraitPrototype>(traitId, out var traitPrototype))
{ {
Logger.Warning($"No trait found with ID {traitId}!"); Log.Warning($"No trait found with ID {traitId}!");
return; return;
} }

4
Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Linq; using System.Linq;
using Content.Server.Worldgen.Components; using Content.Server.Worldgen.Components;
using Content.Server.Worldgen.Prototypes; using Content.Server.Worldgen.Prototypes;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
@@ -35,7 +35,7 @@ public sealed class BiomeSelectionSystem : BaseWorldSystem
return; 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) private void OnBiomeSelectionStartup(EntityUid uid, BiomeSelectionComponent component, ComponentStartup args)

4
Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.GameTicking.Events; using Content.Server.GameTicking.Events;
using Content.Server.Worldgen.Components; using Content.Server.Worldgen.Components;
@@ -74,7 +74,7 @@ public sealed class WorldgenConfigSystem : EntitySystem
return; return;
var target = _map.GetMapEntityId(_gameTicker.DefaultMap); 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<WorldgenConfigPrototype>(_worldgenConfig); var cfg = _proto.Index<WorldgenConfigPrototype>(_worldgenConfig);
cfg.Apply(target, _ser, EntityManager); // Apply the config to the map. cfg.Apply(target, _ser, EntityManager); // Apply the config to the map.

2
Content.Shared/DoAfter/SharedDoAfterSystem.cs
View File

@@ -157,7 +157,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
if (doAfter.Delay <= TimeSpan.Zero) 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; return DoAfterStatus.Finished;
} }

23
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -171,7 +171,7 @@ namespace Content.Shared.Interaction
{ {
if (!ValidateClientInput(session, coords, uid, out var userEntity)) if (!ValidateClientInput(session, coords, uid, out var userEntity))
{ {
Logger.InfoS("system.interaction", $"TryPullObject input validation failed"); Log.Info($"TryPullObject input validation failed");
return true; return true;
} }
@@ -203,7 +203,7 @@ namespace Content.Shared.Interaction
// client sanitization // client sanitization
if (!TryComp(item, out TransformComponent? itemXform) || !ValidateClientInput(args.SenderSession, itemXform.Coordinates, item, out var user)) 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; return;
} }
@@ -225,7 +225,7 @@ namespace Content.Shared.Interaction
// client sanitization // client sanitization
if (!ValidateClientInput(session, coords, uid, out var user)) 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; return true;
} }
@@ -239,7 +239,7 @@ namespace Content.Shared.Interaction
// client sanitization // client sanitization
if (!ValidateClientInput(session, coords, uid, out var userEntity)) if (!ValidateClientInput(session, coords, uid, out var userEntity))
{ {
Logger.InfoS("system.interaction", $"Use input validation failed"); Log.Info($"Use input validation failed");
return true; return true;
} }
@@ -547,7 +547,7 @@ namespace Content.Shared.Interaction
if (length > MaxRaycastRange) 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; length = MaxRaycastRange;
} }
@@ -921,7 +921,7 @@ namespace Content.Shared.Interaction
{ {
if (!ValidateClientInput(session, coords, uid, out var user)) if (!ValidateClientInput(session, coords, uid, out var user))
{ {
Logger.InfoS("system.interaction", $"ActivateItemInWorld input validation failed"); Log.Info($"ActivateItemInWorld input validation failed");
return false; return false;
} }
@@ -1100,14 +1100,13 @@ namespace Content.Shared.Interaction
if (!coords.IsValid(EntityManager)) if (!coords.IsValid(EntityManager))
{ {
Logger.InfoS("system.interaction", $"Invalid Coordinates: client={session}, coords={coords}"); Log.Info($"Invalid Coordinates: client={session}, coords={coords}");
return false; return false;
} }
if (IsClientSide(uid)) if (IsClientSide(uid))
{ {
Logger.WarningS("system.interaction", Log.Warning($"Client sent interaction with client-side entity. Session={session}, Uid={uid}");
$"Client sent interaction with client-side entity. Session={session}, Uid={uid}");
return false; return false;
} }
@@ -1115,15 +1114,13 @@ namespace Content.Shared.Interaction
if (userEntity == null || !userEntity.Value.Valid) if (userEntity == null || !userEntity.Value.Valid)
{ {
Logger.WarningS("system.interaction", Log.Warning($"Client sent interaction with no attached entity. Session={session}");
$"Client sent interaction with no attached entity. Session={session}");
return false; return false;
} }
if (!Exists(userEntity)) if (!Exists(userEntity))
{ {
Logger.WarningS("system.interaction", Log.Warning($"Client attempted interaction with a non-existent attached entity. Session={session}, entity={userEntity}");
$"Client attempted interaction with a non-existent attached entity. Session={session}, entity={userEntity}");
return false; return false;
} }