Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 05:27:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Logger Sawmill Cleanup (#2413)

Browse Source 
# Description
Cleaned up Logger obsolete compiler warnings in non robust code.
Should probably be changed to a ISawmill reference in classes to avoid
repeated lookups in heavy logging logic.
---

# Changelog

🆑

- tweak: Logger to Logger.GetSawmill("name");

---------

Co-authored-by: ilmenwe <no@mail.com>

(cherry picked from commit 2e8ffd971716d38dc6d5a520bebdf88b743045a3)
This commit is contained in:
ilmenwe
2025-05-09 01:26:14 +03:00
committed by Spatison
parent 9d79a60c23
commit 432042e945
53 changed files with 130 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/UserInterface/Controls/SlotControl.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Client.UserInterface.Controls
//this auto registers the button with it's parent container when it's set
if (_slotNameSet)
{
Logger.Warning("Tried to set slotName after init for:" + Name);
Logger.GetSawmill("slot.control").Warning("Tried to set slotName after init for:" + Name);
return;
}
_slotNameSet = true;

2
Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
View File

@@ -193,7 +193,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
return TryTargetEntityWorld(args, actionId, entMapTarget, user, comp) || !entMapTarget.InteractOnMiss;
default:
Logger.Error($"Unknown targeting action: {actionId.GetType()}");
Logger.GetSawmill("action.ui.control").Error($"Unknown targeting action: {actionId.GetType()}");
return false;
}
}

4
Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml.cs
View File

@@ -79,7 +79,7 @@ public sealed partial class AlertsUI : UIWidget
{
if (!alertKey.AlertType.HasValue)
{
Logger.WarningS("alert", "found alertkey without alerttype," +
Logger.GetSawmill("alert").Warning("found alertkey without alerttype," +
" alert keys should never be stored without an alerttype set: {0}", alertKey);
continue;
}
@@ -87,7 +87,7 @@ public sealed partial class AlertsUI : UIWidget
var alertType = alertKey.AlertType.Value;
if (!alertsSystem.TryGet(alertType, out var newAlert))
{
Logger.ErrorS("alert", "Unrecognized alertType {0}", alertType);
Logger.GetSawmill("alert").Error("Unrecognized alertType {0}", alertType);
continue;
}

2
Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs
View File

@@ -123,7 +123,7 @@ public sealed class AHelpUIController : UIController, IOnSystemChanged<BwoinkSys
private void ReceivedBwoink(object? sender, SharedBwoinkSystem.BwoinkTextMessage message)
{
Logger.InfoS("c.s.go.es.bwoink", $"@{message.UserId}: {message.Text}");
Logger.GetSawmill("c.s.go.es.bwoink").Info($"@{message.UserId}: {message.Text}");
var localPlayer = _playerManager.LocalSession;
if (localPlayer == null)
return;

2
Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs
View File

@@ -81,7 +81,7 @@ public partial class ChatBox : UIWidget
private void OnMessageAdded(ChatMessage msg)
{
Logger.DebugS("chat", $"{msg.Channel}: {msg.Message}");
Logger.GetSawmill("chat").Debug($"{msg.Channel}: {msg.Message}");
if (!ChatInput.FilterButton.Popup.IsActive(msg.Channel))
{
return;

4
Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs
View File

@@ -195,7 +195,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered<LobbyS
{
if (!_prototypeManager.TryIndex(guideId, out var guide))
{
Logger.Error($"Encountered unknown guide prototype: {guideId}");
Logger.GetSawmill("guidebook").Error($"Encountered unknown guide prototype: {guideId}");
continue;
}
guides.Add(guideId, guide);
@@ -225,7 +225,7 @@ public sealed class GuidebookUIController : UIController, IOnStateEntered<LobbyS
if (!_prototypeManager.TryIndex(childId, out var child))
{
Logger.Error($"Encountered unknown guide prototype: {childId} as a child of {guide.Id}. If the child is not a prototype, it must be directly provided.");
Logger.GetSawmill("guide.ui.control").Error($"Encountered unknown guide prototype: {childId} as a child of {guide.Id}. If the child is not a prototype, it must be directly provided.");
continue;
}

4
Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs
View File

@@ -1,4 +1,4 @@
using System.Numerics;
using System.Numerics;
using Content.Client.UserInterface.Controls;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
@@ -29,7 +29,7 @@ public sealed class InventoryDisplay : LayoutContainer
VerticalExpand = true;
InheritChildMeasure = true;
if (!_buttons.TryAdd(newButton.SlotName, (newButton, buttonOffset)))
Logger.Warning("Tried to add button without a slot!");
Logger.GetSawmill("inventory.display").Warning("Tried to add button without a slot!");
SetPosition(newButton, buttonOffset * ButtonSize + new Vector2(ButtonSpacing, ButtonSpacing));
UpdateSizeData(buttonOffset);
return newButton;

4
Content.Client/UserInterface/Systems/Inventory/Controls/ItemSlotUIContainer.cs
View File

@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using Content.Client.UserInterface.Controls;
using Robust.Client.UserInterface.Controls;
@@ -84,7 +84,7 @@ public abstract class ItemSlotUIContainer<T> : GridContainer, IItemslotUIContain
{
if (newButton.SlotName == "")
{
Logger.Warning("Could not add button " + newButton.Name + "No slotname");
Logger.GetSawmill("itemslot.ui.container").Warning("Could not add button " + newButton.Name + "No slotname");
}
return !Buttons.TryAdd(newButton.SlotName, newButton) ? null : newButton;

2
Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs
View File

@@ -242,7 +242,7 @@ public sealed class InventoryUIController : UIController, IOnStateEntered<Gamepl
{
if (_inventoryHotbar == null)
{
Logger.Warning("Tried to toggle inventory bar when none are assigned");
Logger.GetSawmill("inventory.ui.control").Warning("Tried to toggle inventory bar when none are assigned");
return;
}

2
Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs
View File

@@ -99,6 +99,6 @@ public sealed class ViewportUIController : UIController
// Currently, this shouldn't happen. This likely happened because the main eye was set to null. When this
// does happen it can create hard to troubleshoot bugs, so lets print some helpful warnings:
Logger.Warning($"Main viewport's eye is in nullspace (main eye is null?). Attached entity: {_entMan.ToPrettyString(ent.Value)}. Entity has eye comp: {eye != null}");
Logger.GetSawmill("viewport.ui.control").Warning($"Main viewport's eye is in nullspace (main eye is null?). Attached entity: {_entMan.ToPrettyString(ent.Value)}. Entity has eye comp: {eye != null}");
}
}