From 3c48e6abaa419e8624d1fbfcdcc9a36d41765d7f Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Sun, 25 May 2025 17:20:08 -0400 Subject: [PATCH] Cleanup some easy-to-fix static logger warnings (#37820) --- .../Administration/Commands/DepartmentBanCommand.cs | 6 +++++- Content.Server/Administration/Commands/RoleBanCommand.cs | 8 ++++++-- Content.Server/Administration/Notes/UserNotesEui.cs | 7 +++++-- Content.Server/EUI/EuiManager.cs | 6 +++++- .../Preferences/Managers/ServerPreferencesManager.cs | 4 ++-- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/Content.Server/Administration/Commands/DepartmentBanCommand.cs b/Content.Server/Administration/Commands/DepartmentBanCommand.cs index a2e527b22a..15f9859ca1 100644 --- a/Content.Server/Administration/Commands/DepartmentBanCommand.cs +++ b/Content.Server/Administration/Commands/DepartmentBanCommand.cs @@ -16,6 +16,9 @@ public sealed class DepartmentBanCommand : IConsoleCommand [Dependency] private readonly IPlayerLocator _locator = default!; [Dependency] private readonly IBanManager _banManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly ILogManager _log = default!; + + private ISawmill? _sawmill; public string Command => "departmentban"; public string Description => Loc.GetString("cmd-departmentban-desc"); @@ -29,7 +32,8 @@ public sealed class DepartmentBanCommand : IConsoleCommand uint minutes; if (!Enum.TryParse(_cfg.GetCVar(CCVars.DepartmentBanDefaultSeverity), out NoteSeverity severity)) { - Logger.WarningS("admin.department_ban", "Department ban severity could not be parsed from config! Defaulting to medium."); + _sawmill ??= _log.GetSawmill("admin.department_ban"); + _sawmill.Warning("Department ban severity could not be parsed from config! Defaulting to medium."); severity = NoteSeverity.Medium; } diff --git a/Content.Server/Administration/Commands/RoleBanCommand.cs b/Content.Server/Administration/Commands/RoleBanCommand.cs index 68fbac0334..7058803d2f 100644 --- a/Content.Server/Administration/Commands/RoleBanCommand.cs +++ b/Content.Server/Administration/Commands/RoleBanCommand.cs @@ -17,8 +17,11 @@ public sealed class RoleBanCommand : IConsoleCommand [Dependency] private readonly IPlayerLocator _locator = default!; [Dependency] private readonly IBanManager _bans = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly ILogManager _log = default!; [Dependency] private readonly IPrototypeManager _proto = default!; + private ISawmill? _sawmill; + public string Command => "roleban"; public string Description => Loc.GetString("cmd-roleban-desc"); public string Help => Loc.GetString("cmd-roleban-help"); @@ -31,7 +34,8 @@ public sealed class RoleBanCommand : IConsoleCommand uint minutes; if (!Enum.TryParse(_cfg.GetCVar(CCVars.RoleBanDefaultSeverity), out NoteSeverity severity)) { - Logger.WarningS("admin.role_ban", "Role ban severity could not be parsed from config! Defaulting to medium."); + _sawmill ??= _log.GetSawmill("admin.role_ban"); + _sawmill.Warning("Role ban severity could not be parsed from config! Defaulting to medium."); severity = NoteSeverity.Medium; } @@ -81,7 +85,7 @@ public sealed class RoleBanCommand : IConsoleCommand if (!_proto.HasIndex(job)) { - shell.WriteError(Loc.GetString("cmd-roleban-job-parse",("job", job))); + shell.WriteError(Loc.GetString("cmd-roleban-job-parse", ("job", job))); return; } diff --git a/Content.Server/Administration/Notes/UserNotesEui.cs b/Content.Server/Administration/Notes/UserNotesEui.cs index bc56bd015d..441e7ae09f 100644 --- a/Content.Server/Administration/Notes/UserNotesEui.cs +++ b/Content.Server/Administration/Notes/UserNotesEui.cs @@ -13,16 +13,19 @@ public sealed class UserNotesEui : BaseEui { [Dependency] private readonly IAdminNotesManager _notesMan = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly ILogManager _log = default!; private readonly bool _seeOwnNotes; + private readonly ISawmill _sawmill; public UserNotesEui() { IoCManager.InjectDependencies(this); + _sawmill = _log.GetSawmill("admin.notes"); _seeOwnNotes = _cfg.GetCVar(CCVars.SeeOwnNotes); if (!_seeOwnNotes) { - Logger.WarningS("admin.notes", "User notes initialized when see_own_notes set to false"); + _sawmill.Warning("User notes initialized when see_own_notes set to false"); } } @@ -39,7 +42,7 @@ public sealed class UserNotesEui : BaseEui { if (!_seeOwnNotes) { - Logger.WarningS("admin.notes", $"User {Player.Name} with ID {Player.UserId} tried to update their own user notes when see_own_notes was set to false"); + _sawmill.Warning($"User {Player.Name} with ID {Player.UserId} tried to update their own user notes when see_own_notes was set to false"); return; } diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs index b789c9c8f8..71f8414294 100644 --- a/Content.Server/EUI/EuiManager.cs +++ b/Content.Server/EUI/EuiManager.cs @@ -9,9 +9,12 @@ namespace Content.Server.EUI { public sealed class EuiManager : IPostInjectInit { + [Dependency] private readonly ILogManager _log = default!; [Dependency] private readonly IPlayerManager _players = default!; [Dependency] private readonly IServerNetManager _net = default!; + private ISawmill? _sawmill; + private readonly Dictionary _playerData = new(); @@ -34,6 +37,7 @@ namespace Content.Server.EUI _net.RegisterNetMessage(); _net.RegisterNetMessage(); _net.RegisterNetMessage(RxMsgMessage); + _sawmill = _log.GetSawmill("eui"); } public void SendUpdates() @@ -99,7 +103,7 @@ namespace Content.Server.EUI if (!dat.OpenUIs.TryGetValue(message.Id, out var eui)) { - Logger.WarningS("eui", $"Got EUI message from player {ply} for non-existing UI {message.Id}"); + _sawmill?.Warning($"Got EUI message from player {ply} for non-existing UI {message.Id}"); return; } diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index b9fd87d88f..7ece769d54 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -55,7 +55,7 @@ namespace Content.Server.Preferences.Managers if (!_cachedPlayerPrefs.TryGetValue(userId, out var prefsData) || !prefsData.PrefsLoaded) { - Logger.WarningS("prefs", $"User {userId} tried to modify preferences before they loaded."); + _sawmill.Warning($"User {userId} tried to modify preferences before they loaded."); return; } @@ -141,7 +141,7 @@ namespace Content.Server.Preferences.Managers if (!_cachedPlayerPrefs.TryGetValue(userId, out var prefsData) || !prefsData.PrefsLoaded) { - Logger.WarningS("prefs", $"User {userId} tried to modify preferences before they loaded."); + _sawmill.Warning($"User {userId} tried to modify preferences before they loaded."); return; }