space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove static logs from EntityManager (#4062)

Browse Source
This commit is contained in:
Leon Friedrich
2023-05-17 16:18:49 +12:00
committed by GitHub
parent 3e2e764f89
commit f06beeb6f6
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Robust.Shared/GameObjects/EntityManager.Components.cs
View File

@@ -450,7 +450,7 @@ namespace Robust.Shared.GameObjects
}
catch (Exception)
{
Logger.Error($"Caught exception while trying to remove component {_componentFactory.GetComponentName(comp.GetType())} from entity '{ToPrettyString(uid)}'");
_sawmill.Error($"Caught exception while trying to remove component {_componentFactory.GetComponentName(comp.GetType())} from entity '{ToPrettyString(uid)}'");
}
}
@@ -491,7 +491,7 @@ namespace Robust.Shared.GameObjects
}
catch (Exception e)
{
Logger.Error($"Caught exception while queuing deferred component removal. Entity={ToPrettyString(component.Owner)}, type={component.GetType()}");
_sawmill.Error($"Caught exception while queuing deferred component removal. Entity={ToPrettyString(component.Owner)}, type={component.GetType()}");
_runtimeLog.LogException(e, nameof(RemoveComponentDeferred));
}
#endif
@@ -501,7 +501,7 @@ namespace Robust.Shared.GameObjects
{
if (component.Deleted)
{
Logger.Warning($"Deleting an already deleted component. Entity: {ToPrettyString(uid)}, Component: {_componentFactory.GetComponentName(component.GetType())}.");
_sawmill.Warning($"Deleting an already deleted component. Entity: {ToPrettyString(uid)}, Component: {_componentFactory.GetComponentName(component.GetType())}.");
return;
}
@@ -526,7 +526,7 @@ namespace Robust.Shared.GameObjects
}
catch (Exception e)
{
Logger.Error($"Caught exception during immediate component removal. Entity={ToPrettyString(component.Owner)}, type={component.GetType()}");
_sawmill.Error($"Caught exception during immediate component removal. Entity={ToPrettyString(component.Owner)}, type={component.GetType()}");
_runtimeLog.LogException(e, nameof(RemoveComponentImmediate));
}
#endif
@@ -552,7 +552,7 @@ namespace Robust.Shared.GameObjects
if (component.Running)
{
// TODO add options to cancel deferred deletion?
Logger.Warning($"Found a running component while culling deferred deletions, owner={ToPrettyString(component.Owner)}, type={component.GetType()}");
_sawmill.Warning($"Found a running component while culling deferred deletions, owner={ToPrettyString(component.Owner)}, type={component.GetType()}");
component.LifeShutdown(this);
}
@@ -563,7 +563,7 @@ namespace Robust.Shared.GameObjects
}
catch (Exception e)
{
Logger.Error($"Caught exception while processing deferred component removal. Entity={ToPrettyString(component.Owner)}, type={component.GetType()}");
_sawmill.Error($"Caught exception while processing deferred component removal. Entity={ToPrettyString(component.Owner)}, type={component.GetType()}");
_runtimeLog.LogException(e, nameof(CullRemovedComponents));
}
#endif
@@ -886,14 +886,14 @@ namespace Robust.Shared.GameObjects
{
var comps = _entTraitArray[CompIdx.ArrayIndex<TComp1>()];
DebugTools.Assert(comps != null, $"Unknown component: {typeof(TComp1).Name}");
return new EntityQuery<TComp1>(comps!);
return new EntityQuery<TComp1>(comps!, _resolveSawmill);
}
public EntityQuery<Component> GetEntityQuery(Type type)
{
var comps = _entTraitArray[CompIdx.ArrayIndex(type)];
DebugTools.Assert(comps != null, $"Unknown component: {type.Name}");
return new EntityQuery<Component>(comps!);
return new EntityQuery<Component>(comps!, _resolveSawmill);
}
/// <inheritdoc />
@@ -1332,10 +1332,12 @@ namespace Robust.Shared.GameObjects
public readonly struct EntityQuery<TComp1> where TComp1 : Component
{
private readonly Dictionary<EntityUid, Component> _traitDict;
private readonly ISawmill _sawmill;
public EntityQuery(Dictionary<EntityUid, Component> traitDict)
public EntityQuery(Dictionary<EntityUid, Component> traitDict, ISawmill sawmill)
{
_traitDict = traitDict;
_sawmill = sawmill;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -1394,7 +1396,7 @@ namespace Robust.Shared.GameObjects
}
if (logMissing)
Logger.ErrorS("resolve", $"Can't resolve \"{typeof(TComp1)}\" on entity {uid}!\n{new StackTrace(1, true)}");
_sawmill.Error($"Can't resolve \"{typeof(TComp1)}\" on entity {uid}!\n{new StackTrace(1, true)}");
return false;
}